Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Dec 2017 05:37:31 +0000 (16:37 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Dec 2017 05:37:31 +0000 (16:37 +1100)
CMakeLists.txt
source/blender/blenkernel/intern/seqeffects.c
source/blender/bmesh/intern/bmesh_marking.c
source/blender/bmesh/operators/bmo_rotate_edges.c
source/blender/python/intern/bpy_capi_utils.h

index 222c75b859340eaf580e9d6e0f02cf1affcba92b..4e4cf06d82c8fd5e4aacb006587e2a2c765d8c6c 100644 (file)
@@ -760,7 +760,7 @@ if(WITH_INTERNATIONAL)
 endif()
 
 if(WITH_PYTHON)
-       # While we have this as an '#error' in bpy_util.h,
+       # While we have this as an '#error' in 'bpy_capi_utils.h',
        # upgrading Python tends to cause confusion for users who build.
        # Give the error message early to make this more obvious.
        #
index df21512a262f6b05797cec1227a7dd9cd8989afc..e02ff31902389340b35339b8e290ede0aac653d0 100644 (file)
@@ -1507,7 +1507,7 @@ static void init_colormix_effect(Sequence *seq)
 {
        ColorMixVars *data;
 
-       if (seq->effectdata){
+       if (seq->effectdata) {
                MEM_freeN(seq->effectdata);
        }
        seq->effectdata = MEM_callocN(sizeof(ColorMixVars), "colormixvars");
index 432c82afe4a0bcd97fec0f607b826719d8ac84d7..1b96237e26294322748384328d840bd6819bc379 100644 (file)
@@ -254,8 +254,8 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
                /* both loops only set edge/face flags and read off verts */
                BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
                        if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
-                               BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
-                               !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+                           BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+                           !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
                        {
                                BM_elem_flag_enable(e, BM_ELEM_SELECT);
                        }
@@ -366,8 +366,8 @@ void BM_mesh_select_flush(BMesh *bm)
 
        BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
                if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
-                       BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
-                       !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+                   BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+                   !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
                {
                        BM_elem_flag_enable(e, BM_ELEM_SELECT);
                }
index dd6bf77dd3cb36b0439e4850243f9e85a6ad4921..9832fdb57d375be3f196efc2baf58cc116b53bba 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/bmesh/operators/bmo_rotate_edge.c
+/** \file blender/bmesh/operators/bmo_rotate_edges.c
  *  \ingroup bmesh
  *
  * Rotate edges topology that share two faces.
index 171c46d8e861317bfdc1cf0dc18abb87cf5023c8..abb37d6e30c0cde55052e6b4d8671a60b804ba20 100644 (file)
@@ -24,8 +24,8 @@
  *  \ingroup pythonintern
  */
 
-#ifndef __BPY_UTIL_H__
-#define __BPY_UTIL_H__
+#ifndef __BPY_CAPI_UTILS_H__
+#define __BPY_CAPI_UTILS_H__
 
 #if PY_VERSION_HEX <  0x03060000
 #  error "Python 3.6 or greater is required, you'll need to update your python."
@@ -50,4 +50,4 @@ void BPy_SetContext(struct bContext *C);
 extern void bpy_context_set(struct bContext *C, PyGILState_STATE *gilstate);
 extern void bpy_context_clear(struct bContext *C, PyGILState_STATE *gilstate);
 
-#endif  /* __BPY_UTIL_H__ */
+#endif  /* __BPY_CAPI_UTILS_H__ */