Revision: 56878
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56878
Author:   campbellbarton
Date:     2013-05-17 12:43:58 +0000 (Fri, 17 May 2013)
Log Message:
-----------
code cleanup: use BM_elem_flag_test rather then accessing 'ele->head.hflag'

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_modifier.c
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types.c

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c       
2013-05-17 12:26:14 UTC (rev 56877)
+++ trunk/blender/source/blender/editors/object/object_modifier.c       
2013-05-17 12:43:58 UTC (rev 56878)
@@ -1527,7 +1527,7 @@
 
        BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
                if (!BLI_ghash_lookup(visited, bm_vert) &&
-                   bm_vert->head.hflag & BM_ELEM_SELECT)
+                   BM_elem_flag_test(bm_vert, BM_ELEM_SELECT))
                {
                        MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
                                                             bm_vert->head.data,
@@ -1582,7 +1582,7 @@
        }
 
        BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
-               if (bm_vert->head.hflag & BM_ELEM_SELECT) {
+               if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) {
                        MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
                                                             bm_vert->head.data,
                                                             CD_MVERT_SKIN);
@@ -1639,7 +1639,7 @@
        }
 
        BM_ITER_MESH (bm_vert, &bm_iter, bm, BM_VERTS_OF_MESH) {
-               if (bm_vert->head.hflag & BM_ELEM_SELECT) {
+               if (BM_elem_flag_test(bm_vert, BM_ELEM_SELECT)) {
                        MVertSkin *vs = CustomData_bmesh_get(&bm->vdata,
                                                             bm_vert->head.data,
                                                             CD_MVERT_SKIN);

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c       
2013-05-17 12:26:14 UTC (rev 56877)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c       
2013-05-17 12:43:58 UTC (rev 56878)
@@ -1383,7 +1383,7 @@
 
        if (PSFRA < PEFRA) {
                glRectf(v2d->cur.xmin, v2d->cur.ymin, (float)PSFRA, 
v2d->cur.ymax);
-               glRectf((float)(PEFRA+1), v2d->cur.ymin, v2d->cur.xmax, 
v2d->cur.ymax);
+               glRectf((float)(PEFRA + 1), v2d->cur.ymin, v2d->cur.xmax, 
v2d->cur.ymax);
        }
        else {
                glRectf(v2d->cur.xmin, v2d->cur.ymin, v2d->cur.xmax, 
v2d->cur.ymax);
@@ -1392,7 +1392,7 @@
        UI_ThemeColorShade(TH_BACK, -60);
        /* thin lines where the actual frames are */
        fdrawline((float)PSFRA, v2d->cur.ymin, (float)PSFRA, v2d->cur.ymax);
-       fdrawline((float)(PEFRA+1), v2d->cur.ymin, (float)(PEFRA+1), 
v2d->cur.ymax);
+       fdrawline((float)(PEFRA + 1), v2d->cur.ymin, (float)(PEFRA + 1), 
v2d->cur.ymax);
        
        glDisable(GL_BLEND);
 }

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c   2013-05-17 
12:26:14 UTC (rev 56877)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c   2013-05-17 
12:43:58 UTC (rev 56878)
@@ -5023,7 +5023,7 @@
 /* context and ptr_default can be NULL */
 char *RNA_pointer_as_string_keywords_ex(bContext *C, PointerRNA *ptr, 
PointerRNA *ptr_default,
                                         const short as_function, const short 
all_args,
-                                                                               
const int max_prop_length,
+                                        const int max_prop_length,
                                         PropertyRNA *iterprop)
 {
        const char *arg_name = NULL;

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c  2013-05-17 
12:26:14 UTC (rev 56877)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c  2013-05-17 
12:43:58 UTC (rev 56878)
@@ -1171,7 +1171,7 @@
                else {
                        char filter_flags_ch = (char)filter_flags;
                        BM_ITER_MESH (eve, &iter, self->bm, BM_VERTS_OF_MESH) {
-                               if (eve->head.hflag & filter_flags_ch) {
+                               if (BM_elem_flag_test(eve, filter_flags_ch)) {
                                        mul_m4_v3((float (*)[4])mat_ptr, 
eve->co);
                                }
                        }

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to