diff options
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 8 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/operators/bmo_fill_grid.c | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 8a3abcb9b5e..12ec3da9b69 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -944,7 +944,7 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, } - if ((!use_beauty) || (!r_faces_new)){ + if ((!use_beauty) || (!r_faces_new)) { /* we can't delete the real face, because some of the callers expect it to remain valid. * so swap data and delete the last created tri */ bmesh_face_swap_data(bm, f, f_new); @@ -979,7 +979,8 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, if (nf_i < edge_array_len) { r_faces_new[nf_i++] = f_a; - } else { + } + else { f_new = f_a; break; } @@ -990,7 +991,8 @@ void BM_face_triangulate(BMesh *bm, BMFace *f, if (nf_i < edge_array_len) { r_faces_new[nf_i++] = f_b; - } else { + } + else { f_new = f_b; break; } diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 238b7b4aaaa..aca2f96dc18 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -37,7 +37,7 @@ #include "intern/bmesh_walkers_private.h" /* pop into stack memory (common operation) */ -#define BMW_state_remove_r(walker, owalk) { \ +#define BMW_state_remove_r(walker, owalk) { \ memcpy(owalk, BMW_current_state(walker), sizeof(*(owalk))); \ BMW_state_remove(walker); \ } (void)0 diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index a4b1237bc5d..4e302a8ff63 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -142,11 +142,11 @@ static void bm_loop_pair_from_verts(BMVert *v_a, BMVert *v_b, static void bm_loop_pair_test_copy(BMLoop *l_pair_a[2], BMLoop *l_pair_b[2]) { /* if the first one is set, we know the second is too */ - if (l_pair_a[0] && l_pair_b[0] == NULL) { + if (l_pair_a[0] && l_pair_b[0] == NULL) { l_pair_b[0] = l_pair_a[1]; l_pair_b[1] = l_pair_a[0]; } - else if (l_pair_b[0] && l_pair_a[0] == NULL) { + else if (l_pair_b[0] && l_pair_a[0] == NULL) { l_pair_a[0] = l_pair_b[1]; l_pair_a[1] = l_pair_b[0]; } |