diff options
10 files changed, 19 insertions, 15 deletions
diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c index 96664b776f0..dc0c48cf33f 100644 --- a/source/blender/blenlib/intern/math_rotation.c +++ b/source/blender/blenlib/intern/math_rotation.c @@ -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}, - }; +}; // _axis_convert_num = {'X': 0, 'Y': 1, 'Z': 2, '-X': 3, '-Y': 4, '-Z': 5} diff --git a/source/blender/bmesh/operators/bmo_create.c b/source/blender/bmesh/operators/bmo_create.c index ad858c514d2..e43c04f7d08 100644 --- a/source/blender/bmesh/operators/bmo_create.c +++ b/source/blender/bmesh/operators/bmo_create.c @@ -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 */ - 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... * diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index f7e983fb745..3c1b210d171 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -261,11 +261,14 @@ static void edgering_sel(RingSelOpData *lcd, int previewlines, bool select) eed_last = eed; } + if ((eed_last != eed_start) && #ifdef BMW_EDGERING_NGON - if (lasteed != startedge && BM_edge_share_face_check(lasteed, startedge)) { + BM_edge_share_face_check(eed_last, eed_start) #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 + ) + { v[1][0] = v[0][0]; v[1][1] = v[0][1]; diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index e9694b8a8f3..7ec1113a75f 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -927,10 +927,11 @@ static EnumPropertyItem *select_similar_type_itemf(bContext *C, PointerRNA *UNUS } 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 - for (a = SIMFACE_MATERIAL; a <= SIMFACE_COPLANAR; a++) { + const int a_end = SIMFACE_COPLANAR; #endif + for (a = SIMFACE_MATERIAL; a <= a_end; a++) { RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a); } } diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index d82606f52f0..e6d609d2008 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -576,8 +576,8 @@ bool paint_supports_dynamic_tex_coords(Brush *br, PaintMode mode) if (sculpt_is_grab_tool(br)) return false; default: - ; - } + break; + } return true; } diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 64e80d4383c..63790cf7d25 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -429,10 +429,9 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position) } } } - else { -#else - if (1) { + else #endif + { ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect); tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position, diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 6db7cfc8efd..922c865a0d5 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -97,7 +97,8 @@ class Mem_IStream : public Imf::IStream public: Mem_IStream (unsigned char *exrbuf, size_t exrsize) : - IStream("dummy"), _exrpos(0), _exrsize(exrsize) { + IStream("dummy"), _exrpos(0), _exrsize(exrsize) + { _exrbuf = exrbuf; } diff --git a/source/blender/nodes/shader/nodes/node_shader_particle_info.c b/source/blender/nodes/shader/nodes/node_shader_particle_info.c index dc98b7d5f63..05f7301776f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_particle_info.c +++ b/source/blender/nodes/shader/nodes/node_shader_particle_info.c @@ -39,7 +39,7 @@ static bNodeSocketTemplate outputs[] = { { SOCK_VECTOR, 0, "Velocity" }, { SOCK_VECTOR, 0, "Angular Velocity" }, { -1, 0, "" } - }; +}; /* node type definition */ void register_node_type_sh_particle_info(void) diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 64435792ae2..b8572baa7f9 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -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 */ - }; +}; static PyMappingMethods bpy_bmdeformvert_as_mapping = { (lenfunc)bpy_bmdeformvert_len, diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index 6dcef9db407..df3096eed07 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -135,7 +135,7 @@ enum { NDOF_BUTTON_C, // the end NDOF_LAST - }; +}; /* SYSTEM : 0x01xx */ |