style cleanup: braces/indentation
authorCampbell Barton <ideasman42@gmail.com>
Fri, 19 Jul 2013 16:44:17 +0000 (16:44 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 19 Jul 2013 16:44:17 +0000 (16:44 +0000)
source/blender/blenlib/intern/math_rotation.c
source/blender/bmesh/operators/bmo_create.c
source/blender/editors/mesh/editmesh_loopcut.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/imbuf/intern/anim_movie.c
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/nodes/shader/nodes/node_shader_particle_info.c
source/blender/python/bmesh/bmesh_py_types_meshdata.c
source/blender/windowmanager/wm_event_types.h

index 96664b776f0d8020e3ee3bab4f2d8fe5c96b53a4..dc0c48cf33fd171c3394fcf3433c1f1a1475bd65 100644 (file)
@@ -1816,7 +1816,7 @@ static int _axis_convert_lut[23][24] = {
        {0x408, 0x810, 0xA20, 0x228, 0x081, 0x891, 0x699, 0x2A9, 0x102, 0x50A,
         0x71A, 0xB22, 0x4CB, 0x8D3, 0xAE3, 0x2EB, 0x144, 0x954, 0x75C, 0x36C,
         0x045, 0x44D, 0x65D, 0xA65},
        {0x408, 0x810, 0xA20, 0x228, 0x081, 0x891, 0x699, 0x2A9, 0x102, 0x50A,
         0x71A, 0xB22, 0x4CB, 0x8D3, 0xAE3, 0x2EB, 0x144, 0x954, 0x75C, 0x36C,
         0x045, 0x44D, 0x65D, 0xA65},
-       };
+};
 
 // _axis_convert_num = {'X': 0, 'Y': 1, 'Z': 2, '-X': 3, '-Y': 4, '-Z': 5}
 
 
 // _axis_convert_num = {'X': 0, 'Y': 1, 'Z': 2, '-X': 3, '-Y': 4, '-Z': 5}
 
index ad858c514d20f42a4100647aa5d75c71a3ad0347..e43c04f7d080ae66b4cb08dffd3e3e78529e25eb 100644 (file)
@@ -217,7 +217,7 @@ void bmo_contextual_create_exec(BMesh *bm, BMOperator *op)
        /* Continue with ad-hoc fill methods since operators fail,
         * edge, vcloud... may add more */
 
        /* Continue with ad-hoc fill methods since operators fail,
         * edge, vcloud... may add more */
 
-        if (0) { /* nice feature but perhaps it should be a different tool? */
+       if (0) { /* nice feature but perhaps it should be a different tool? */
 
                /* tricky feature for making a line/edge from selection history...
                 *
 
                /* tricky feature for making a line/edge from selection history...
                 *
index f7e983fb745649b172ce2477045a90b5f0b2f6b1..3c1b210d171661237ae37caf1158f8fa4a92e6d8 100644 (file)
@@ -261,11 +261,14 @@ static void edgering_sel(RingSelOpData *lcd, int previewlines, bool select)
                eed_last = eed;
        }
        
                eed_last = eed;
        }
        
+       if ((eed_last != eed_start) &&
 #ifdef BMW_EDGERING_NGON
 #ifdef BMW_EDGERING_NGON
-       if (lasteed != startedge && BM_edge_share_face_check(lasteed, startedge)) {
+           BM_edge_share_face_check(eed_last, eed_start)
 #else
 #else
-       if (eed_last != eed_start && BM_edge_share_quad_check(eed_last, eed_start)) {
+           BM_edge_share_quad_check(eed_last, eed_start)
 #endif
 #endif
+           )
+       {
                v[1][0] = v[0][0];
                v[1][1] = v[0][1];
 
                v[1][0] = v[0][0];
                v[1][1] = v[0][1];
 
index e9694b8a8f3125c2283016d02b2176b5282bbc4b..7ec1113a75f22d28e10282d9e862ef085e1f0d2f 100644 (file)
@@ -927,10 +927,11 @@ static EnumPropertyItem *select_similar_type_itemf(bContext *C, PointerRNA *UNUS
                }
                else if (em->selectmode & SCE_SELECT_FACE) {
 #ifdef WITH_FREESTYLE
                }
                else if (em->selectmode & SCE_SELECT_FACE) {
 #ifdef WITH_FREESTYLE
-                       for (a = SIMFACE_MATERIAL; a <= SIMFACE_FREESTYLE; a++) {
+                       const int a_end = SIMFACE_FREESTYLE;
 #else
 #else
-                       for (a = SIMFACE_MATERIAL; a <= SIMFACE_COPLANAR; a++) {
+                       const int a_end = SIMFACE_COPLANAR;
 #endif
 #endif
+                       for (a = SIMFACE_MATERIAL; a <= a_end; a++) {
                                RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a);
                        }
                }
                                RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a);
                        }
                }
index d82606f52f0dee09e73fcbeec14b80f8586df2fe..e6d609d2008ccca04cd498f07ab61b02613f8a09 100644 (file)
@@ -576,8 +576,8 @@ bool paint_supports_dynamic_tex_coords(Brush *br, PaintMode mode)
                        if (sculpt_is_grab_tool(br))
                                return false;
                default:
                        if (sculpt_is_grab_tool(br))
                                return false;
                default:
-                       ;
-               }
+                       break;
+       }
        return true;
 }
 
        return true;
 }
 
index 64e80d4383cd72739658c96ffd815e2fc8d226ba..63790cf7d25176afd1ecf25196d4d47cec5e5b29 100644 (file)
@@ -429,10 +429,9 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position)
                        }
                }
        }
                        }
                }
        }
-       else {
-#else
-       if (1) {
+       else
 #endif
 #endif
+       {
                ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect);
 
                tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position,
                ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect);
 
                tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position,
index 6db7cfc8efdaf9f0ca2dce2922b5d16313820d6c..922c865a0d5aea5701e7898534be6beccd165df8 100644 (file)
@@ -97,7 +97,8 @@ class Mem_IStream : public Imf::IStream
 public:
 
        Mem_IStream (unsigned char *exrbuf, size_t exrsize) :
 public:
 
        Mem_IStream (unsigned char *exrbuf, size_t exrsize) :
-               IStream("dummy"), _exrpos(0), _exrsize(exrsize) {
+               IStream("dummy"), _exrpos(0), _exrsize(exrsize)
+       {
                _exrbuf = exrbuf;
        }
 
                _exrbuf = exrbuf;
        }
 
index dc98b7d5f63013eea72c57d7310ea86f385e01c5..05f7301776fc4ab867215529e1e52287e5ddc3e0 100644 (file)
@@ -39,7 +39,7 @@ static bNodeSocketTemplate outputs[] = {
        { SOCK_VECTOR,  0, "Velocity" },
        { SOCK_VECTOR,  0, "Angular Velocity" },
        { -1, 0, "" }
        { SOCK_VECTOR,  0, "Velocity" },
        { SOCK_VECTOR,  0, "Angular Velocity" },
        { -1, 0, "" }
-       };
+};
 
 /* node type definition */
 void register_node_type_sh_particle_info(void)
 
 /* node type definition */
 void register_node_type_sh_particle_info(void)
index 64435792ae2d3279c5621f1dedf4721babf51898..b8572baa7f90bf7e4dd0411622d80260f4ae9532 100644 (file)
@@ -499,7 +499,7 @@ static PySequenceMethods bpy_bmdeformvert_as_sequence = {
        (objobjproc)bpy_bmdeformvert_contains,       /* sq_contains */
        (binaryfunc) NULL,                           /* sq_inplace_concat */
        (ssizeargfunc) NULL,                         /* sq_inplace_repeat */
        (objobjproc)bpy_bmdeformvert_contains,       /* sq_contains */
        (binaryfunc) NULL,                           /* sq_inplace_concat */
        (ssizeargfunc) NULL,                         /* sq_inplace_repeat */
-       };
+};
 
 static PyMappingMethods bpy_bmdeformvert_as_mapping = {
        (lenfunc)bpy_bmdeformvert_len,
 
 static PyMappingMethods bpy_bmdeformvert_as_mapping = {
        (lenfunc)bpy_bmdeformvert_len,
index 6dcef9db4079bc39641851382f082c1c8ae450a8..df3096eed07eb6e275d52d19f43697b0d2b0ec2b 100644 (file)
@@ -135,7 +135,7 @@ enum {
        NDOF_BUTTON_C,
        // the end
        NDOF_LAST
        NDOF_BUTTON_C,
        // the end
        NDOF_LAST
-       };
+};
 
 
 /* SYSTEM : 0x01xx */
 
 
 /* SYSTEM : 0x01xx */