diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 08:37:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 08:37:31 +0300 |
| commit | d47d263b4b4aad15171add322586f3f13dbcdad8 (patch) | |
| tree | b9c761234831ca9bf11272d056781babfacfb16c | |
| parent | e1eb1fbfcac5b840933969e52fed970167d2bb77 (diff) | |
Cleanup: style
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_marking.c | 8 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_rotate_edges.c | 2 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_capi_utils.h | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 222c75b8593..4e4cf06d82c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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. # diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index df21512a262..e02ff319023 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -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"); diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 432c82afe4a..1b96237e262 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -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); } diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.c b/source/blender/bmesh/operators/bmo_rotate_edges.c index dd6bf77dd3c..9832fdb57d3 100644 --- a/source/blender/bmesh/operators/bmo_rotate_edges.c +++ b/source/blender/bmesh/operators/bmo_rotate_edges.c @@ -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. diff --git a/source/blender/python/intern/bpy_capi_utils.h b/source/blender/python/intern/bpy_capi_utils.h index 171c46d8e86..abb37d6e30c 100644 --- a/source/blender/python/intern/bpy_capi_utils.h +++ b/source/blender/python/intern/bpy_capi_utils.h @@ -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__ */ |