[Bf-blender-cvs] [8d7005d7152] master: Cleanup: style, use braces for bmesh
Campbell Barton
noreply at git.blender.org
Wed Mar 27 07:27:04 CET 2019
Commit: 8d7005d7152459eb66fa33ae14eba94a0169adbb
Author: Campbell Barton
Date: Wed Mar 27 17:14:36 2019 +1100
Branches: master
https://developer.blender.org/rB8d7005d7152459eb66fa33ae14eba94a0169adbb
Cleanup: style, use braces for bmesh
===================================================================
M source/blender/bmesh/intern/bmesh_construct.c
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/bmesh/intern/bmesh_edgeloop.c
M source/blender/bmesh/intern/bmesh_inline.h
M source/blender/bmesh/intern/bmesh_interp.c
M source/blender/bmesh/intern/bmesh_iterators.c
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_mesh.c
M source/blender/bmesh/intern/bmesh_mesh_conv.c
M source/blender/bmesh/intern/bmesh_operator_api_inline.h
M source/blender/bmesh/intern/bmesh_operators.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/intern/bmesh_structure.c
M source/blender/bmesh/intern/bmesh_structure_inline.h
M source/blender/bmesh/intern/bmesh_walkers_impl.c
M source/blender/bmesh/operators/bmo_bridge.c
M source/blender/bmesh/operators/bmo_connect_concave.c
M source/blender/bmesh/operators/bmo_create.c
M source/blender/bmesh/operators/bmo_dissolve.c
M source/blender/bmesh/operators/bmo_dupe.c
M source/blender/bmesh/operators/bmo_edgenet.c
M source/blender/bmesh/operators/bmo_extrude.c
M source/blender/bmesh/operators/bmo_fill_grid.c
M source/blender/bmesh/operators/bmo_hull.c
M source/blender/bmesh/operators/bmo_inset.c
M source/blender/bmesh/operators/bmo_join_triangles.c
M source/blender/bmesh/operators/bmo_mirror.c
M source/blender/bmesh/operators/bmo_primitive.c
M source/blender/bmesh/operators/bmo_removedoubles.c
M source/blender/bmesh/operators/bmo_smooth_laplacian.c
M source/blender/bmesh/operators/bmo_subdivide.c
M source/blender/bmesh/operators/bmo_subdivide_edgering.c
M source/blender/bmesh/operators/bmo_utils.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/bmesh/tools/bmesh_bisect_plane.c
M source/blender/bmesh/tools/bmesh_decimate_collapse.c
M source/blender/bmesh/tools/bmesh_decimate_dissolve.c
M source/blender/bmesh/tools/bmesh_intersect.c
M source/blender/bmesh/tools/bmesh_path.c
M source/blender/bmesh/tools/bmesh_region_match.c
M source/blender/bmesh/tools/bmesh_wireframe.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index fba71b20e7c..c24a5b21b6c 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -737,7 +737,9 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
ftable[i] = f_new;
- if (f == bm_old->act_face) bm_new->act_face = f_new;
+ if (f == bm_old->act_face) {
+ bm_new->act_face = f_new;
+ }
}
bm_old->elem_index_dirty &= ~BM_FACE;
bm_new->elem_index_dirty &= ~BM_FACE;
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index eead30bcd24..58b83cd0586 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -152,8 +152,9 @@ BMEdge *BM_edge_create(
BLI_assert((e_example == NULL) || (e_example->head.htype == BM_EDGE));
BLI_assert(!(create_flag & 1));
- if ((create_flag & BM_CREATE_NO_DOUBLE) && (e = BM_edge_exists(v1, v2)))
+ if ((create_flag & BM_CREATE_NO_DOUBLE) && (e = BM_edge_exists(v1, v2))) {
return e;
+ }
e = BLI_mempool_alloc(bm->epool);
@@ -554,11 +555,13 @@ int bmesh_elem_check(void *element, const char htype)
IS_FACE_WRONG_LENGTH = (1 << 26),
} err = 0;
- if (!element)
+ if (!element) {
return IS_NULL;
+ }
- if (head->htype != htype)
+ if (head->htype != htype) {
return IS_WRONG_TYPE;
+ }
switch (htype) {
case BM_VERT:
@@ -748,8 +751,9 @@ static void bm_kill_only_vert(BMesh *bm, BMVert *v)
BM_select_history_remove(bm, v);
- if (v->head.data)
+ if (v->head.data) {
CustomData_bmesh_free_block(&bm->vdata, &v->head.data);
+ }
if (bm->vtoolflagpool) {
BLI_mempool_free(bm->vtoolflagpool, ((BMVert_OFlag *)v)->oflags);
@@ -769,8 +773,9 @@ static void bm_kill_only_edge(BMesh *bm, BMEdge *e)
BM_select_history_remove(bm, (BMElem *)e);
- if (e->head.data)
+ if (e->head.data) {
CustomData_bmesh_free_block(&bm->edata, &e->head.data);
+ }
if (bm->etoolflagpool) {
BLI_mempool_free(bm->etoolflagpool, ((BMEdge_OFlag *)e)->oflags);
@@ -784,8 +789,9 @@ static void bm_kill_only_edge(BMesh *bm, BMEdge *e)
*/
static void bm_kill_only_face(BMesh *bm, BMFace *f)
{
- if (bm->act_face == f)
+ if (bm->act_face == f) {
bm->act_face = NULL;
+ }
bm->totface--;
bm->elem_index_dirty |= BM_FACE;
@@ -793,8 +799,9 @@ static void bm_kill_only_face(BMesh *bm, BMFace *f)
BM_select_history_remove(bm, (BMElem *)f);
- if (f->head.data)
+ if (f->head.data) {
CustomData_bmesh_free_block(&bm->pdata, &f->head.data);
+ }
if (bm->ftoolflagpool) {
BLI_mempool_free(bm->ftoolflagpool, ((BMFace_OFlag *)f)->oflags);
@@ -810,8 +817,9 @@ static void bm_kill_only_loop(BMesh *bm, BMLoop *l)
{
bm->totloop--;
bm->elem_index_dirty |= BM_LOOP;
- if (l->head.data)
+ if (l->head.data) {
CustomData_bmesh_free_block(&bm->ldata, &l->head.data);
+ }
BLI_mempool_free(bm->lpool, l);
}
@@ -1128,8 +1136,9 @@ static int UNUSED_FUNCTION(bm_vert_systag_count_disk)(BMVert *v, const char api_
BMEdge *e = v->e;
int i = 0;
- if (!e)
+ if (!e) {
return 0;
+ }
do {
i += BM_ELEM_API_FLAG_TEST(e, api_flag) ? 1 : 0;
@@ -1146,8 +1155,9 @@ static bool bm_vert_is_manifold_flagged(BMVert *v, const char api_flag)
{
BMEdge *e = v->e;
- if (!e)
+ if (!e) {
return false;
+ }
do {
BMLoop *l = e->l;
@@ -1161,8 +1171,9 @@ static bool bm_vert_is_manifold_flagged(BMVert *v, const char api_flag)
}
do {
- if (!BM_ELEM_API_FLAG_TEST(l->f, api_flag))
+ if (!BM_ELEM_API_FLAG_TEST(l->f, api_flag)) {
return false;
+ }
} while ((l = l->radial_next) != e->l);
} while ((e = bmesh_disk_edge_next(e, v)) != v->e);
@@ -1209,8 +1220,9 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del)
return NULL;
}
- if (totface == 1)
+ if (totface == 1) {
return faces[0];
+ }
bm_elements_systag_enable(faces, totface, _FLAG_JF);
@@ -1291,8 +1303,9 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del)
BMLoop *l2 = l_iter->radial_next;
do {
- if (BM_ELEM_API_FLAG_TEST(l2->f, _FLAG_JF))
+ if (BM_ELEM_API_FLAG_TEST(l2->f, _FLAG_JF)) {
break;
+ }
l2 = l2->radial_next;
} while (l2 != l_iter);
@@ -1486,31 +1499,38 @@ BMFace *bmesh_kernel_split_face_make_edge(
l_iter = l_first = l_f1;
first_loop_f1 = 0;
do {
- if (l_iter == f->l_first)
+ if (l_iter == f->l_first) {
first_loop_f1 = 1;
+ }
} while ((l_iter = l_iter->next) != l_first);
if (first_loop_f1) {
/* original first loop was in f1, find a suitable first loop for f2
* which is as similar as possible to f1. the order matters for tools
* such as duplifaces. */
- if (f->l_first->prev == l_f1)
+ if (f->l_first->prev == l_f1) {
f2->l_first = l_f2->prev;
- else if (f->l_first->next == l_f1)
+ }
+ else if (f->l_first->next == l_f1) {
f2->l_first = l_f2->next;
- else
+ }
+ else {
f2->l_first = l_f2;
+ }
}
else {
/* original first loop was in f2, further do same as above */
f2->l_first = f->l_first;
- if (f->l_first->prev == l_f2)
+ if (f->l_first->prev == l_f2) {
f->l_first = l_f1->prev;
- else if (f->l_first->next == l_f2)
+ }
+ else if (f->l_first->next == l_f2) {
f->l_first = l_f1->next;
- else
+ }
+ else {
f->l_first = l_f1;
+ }
}
#endif
@@ -1539,7 +1559,9 @@ BMFace *bmesh_kernel_split_face_make_edge(
f->len = f1len;
- if (r_l) *r_l = l_f2;
+ if (r_l) {
+ *r_l = l_f2;
+ }
#ifdef USE_BMESH_HOLES
if (holes) {
@@ -1728,7 +1750,9 @@ BMVert *bmesh_kernel_split_edge_make_vert(BMesh *bm, BMVert *tv, BMEdge *e, BMEd
BM_CHECK_ELEMENT(e);
BM_CHECK_ELEMENT(tv);
- if (r_e) *r_e = e_new;
+ if (r_e) {
+ *r_e = e_new;
+ }
return v_new;
}
@@ -2123,16 +2147,18 @@ BMFace *bmesh_kernel_join_face_kill_edge(BMesh *bm, BMFace *f1, BMFace *f2, BMEd
l_f2->prev->next = l_f1->next;
/* if l_f1 was baseloop, make l_f1->next the base. */
- if (BM_FACE_FIRST_LOOP(f1) == l_f1)
+ if (BM_FACE_FIRST_LOOP(f1) == l_f1) {
BM_FACE_FIRST_LOOP(f1) = l_f1->next;
+ }
/* increase length of f1 */
f1->len += (f2->len - 2);
/* make sure each loop points to the proper face */
newlen = f1->len;
- for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f1); i < newlen; i++, l_iter = l_iter->next)
+ for (i = 0, l_iter = BM_FACE_FIRST_LOOP(f1); i < newlen; i++, l_iter = l_iter->next) {
l_iter->f = f1;
+ }
/* remove edge from the disk cycle of its two vertices */
bmesh_disk_edge_remove(l_f1->e, l_f1->e->v1);
diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.c b/source/blender/bmesh/intern/bmesh_edgeloop.c
index 7bd86922df2..1f8661c3e04 100644
--- a/source/blender/bmesh/intern/bmesh_edgeloop.c
+++ b/source/blender/bmesh/intern/bmesh_edgeloop.c
@@ -471,8 +471,9 @@ void BM_mesh_edgeloops_calc_order(BMesh *UNUSED(bm), ListBase *eloops, const boo
const float *no = ((BMEdgeLoopStore *)eloops_ordered.last)->no;
float len_best_sq = FLT_MAX;
- if (use_normals)
+ if (use_normals) {
BLI_ASSERT_UNIT_V3(no);
+ }
for (el_store = eloops->first; el_store; el_store = el_store->next) {
float len_sq;
@@ -619,8 +620,9 @@ void BM_edgeloop_calc_center(BMesh *UNUSED(bm), BMEdgeLoopStore *el_store)
v_next = NODE_AS_CO(node_next);
} while (1);
- if (totw != 0.0f)
+ if (totw != 0.0f) {
mul_v3_fl(el_store->co, 1.0f / (float) totw);
+ }
}
diff --git a/source/blender/bmesh/intern/bmesh_inline.h b/source/blender/bmesh/intern/bmesh_inline.h
index 39657f1c32e..549fc90fe40 100644
--- a/source/blender/bmesh/intern/bmesh_inline.h
+++ b/source/blender/bmesh/intern/bmesh_inline.h
@@ -58,8 +58,8 @@ BLI_INLINE void _bm_elem_flag_disable(BMHeader *head, const char hflag)
BLI_INLINE void _bm_elem_flag_set(BMHeader *head, const char hflag, const int val)
{
- if (val) _bm_elem_flag_enable(head, hflag);
- else _bm_elem_flag_disable(head, hflag);
+ if (val) { _bm_elem_flag_enable(head, hflag); }
+ else { _bm_elem_flag_disable(head, hflag); }
}
BLI_INLINE void _bm_elem_flag_toggle(BMHeader *head, const char hflag)
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 655772b49ac..11d6df430c3 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -177,8 +177,9 @@ void BM_face_interp_from_face_ex(
float co[2];
int i;
- if (f_src != f_dst)
+ if (f_src != f_dst) {
BM_elem_attrs_copy(bm, bm, f_src, f_dst);
+ }
/* interpolate */
i = 0;
@@ -213,7 +214,9 @@ void BM_face_interp_from_face(BMesh *bm, BMFace *f_dst, const BMFace *f_src, con
do {
mul_v2_m3v3(cos_2d[i], axis_mat, l_iter->v->co);
blocks_l[i] = l_iter->head.data;
- if (do_vertex) blocks_v[i] = l_iter->v->head.data;
+ if (do_vertex) {
+ blocks_v[i] = l_iter->v->head.data;
+ }
} while ((void)i++, (l_iter = l_iter->next) != l_first);
BM_face_interp_from_face_ex(bm, f_dst, f_src, do_vertex,
@@ -324,10 +327,12 @@ static bool mdisp_in_mdispquad(
float v1[3], v2[3], c[3], v3[3], v4[3], e1[3], e2[3];
float eps = FLT_EPSILON * 4000;
- if (is_zero_v3(l_src->v->no))
+ if (is_zero_v3(l_src->v->no)) {
BM_vert_normal_update_all(l_src->v);
- if (is_zero_v3(l_dst->v->no))
+ }
+ if (is_zero_v3(l_dst->v->no)) {
BM_vert_normal_update_all(l_dst->v);
+ }
compute_mdisp_quad(l_dst, l_dst_f_center, v1, v2, v3, v4, e1, e2);
@@ -341,8 +346,9 @@ static bool mdisp_in_mdispquad(
add_v3_v3(v1, c); add_v3_v3(v2, c);
add_v3_v3(v3, c); add_v3_v3(v4, c);
- if (!quad_co(v1, v2, v3, v4, p, l_src->v->no, r_uv))
+ if (!quad_co(v1, v2, v3, v4, p, l_src->v->no, r_uv)) {
return 0;
+ }
mul_v2_fl(r_uv, (float)(res - 1));
@@ -386,8 +392,9 @@ static void bm_loop_flip_disp(
if (fabsf(d) < 1e-4f) {
d = bm_loop_flip_equotion(mat, b, target_axis_x, target_axis_y, coord, 0, 2);
- if (fabsf(d) < 1e-4f)
+ if (fabsf(d) < 1e-4f) {
d = bm_loop_flip_equotion(mat, b, target_axis_x, target_axis_y, coord, 1, 2);
+ }
}
disp[0] = (b[0] * mat[1][1] - mat[0][1] * b[1]) / d;
@@ -472,8 +479,9 @@ void BM_loop_interp_multires_ex(
float axis_x[3], axis_y[3];
/* ignore 2-edged faces */
- if (UNLIKELY(
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list