diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-25 08:14:13 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-25 08:34:32 +0300 |
commit | c9e35c2ced92082c86f1ecb9ecd16c6230218c7c (patch) | |
tree | 24bd862961d2bbfa022cfc3c5262cfe1e63550b3 /source/blender/bmesh | |
parent | 865894481ce76325d817533c654bda2ce2e65c66 (diff) |
Cleanup: remove redundant double parenthesis
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_query.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_bridge.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_fill_edgeloop.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_rotate_edges.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_smooth_laplacian.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bisect_plane.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_collapse.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_decimate_dissolve.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_edgesplit.c | 4 |
11 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 8b56e08c22b..13619d8e235 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -192,7 +192,7 @@ BMFace *BM_face_split(BMesh *bm, BLI_assert(!BM_loop_is_adjacent(l_a, l_b)); /* could be an assert */ - if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b)) || UNLIKELY((f != l_a->f || f != l_b->f))) { + if (UNLIKELY(BM_loop_is_adjacent(l_a, l_b)) || UNLIKELY(f != l_a->f || f != l_b->f)) { if (r_l) { *r_l = NULL; } diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index 8bc16324971..643b5750d76 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -580,7 +580,7 @@ bool BM_vert_is_edge_pair_manifold(const BMVert *v) const BMEdge *e = v->e; if (e) { BMEdge *e_other = BM_DISK_EDGE_NEXT(e, v); - if (((e_other != e) && (BM_DISK_EDGE_NEXT(e_other, v) == e))) { + if ((e_other != e) && (BM_DISK_EDGE_NEXT(e_other, v) == e)) { return BM_edge_is_manifold(e) && BM_edge_is_manifold(e_other); } } diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index bd12287e63e..ef9892669ed 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -1062,7 +1062,7 @@ static void *bmw_EdgeLoopWalker_step(BMWalker *walker) l = NULL; break; } - } while ((++i != i_opposite)); + } while (++i != i_opposite); } else { l = NULL; diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c index 1a2c52a321f..8240fbc53c1 100644 --- a/source/blender/bmesh/operators/bmo_bridge.c +++ b/source/blender/bmesh/operators/bmo_bridge.c @@ -147,7 +147,7 @@ static void bridge_loop_pair(BMesh *bm, } if (use_merge) { - BLI_assert((el_store_a_len == el_store_b_len)); + BLI_assert(el_store_a_len == el_store_b_len); } if (el_store_a_len != el_store_b_len) { diff --git a/source/blender/bmesh/operators/bmo_fill_edgeloop.c b/source/blender/bmesh/operators/bmo_fill_edgeloop.c index 86d204ea6a7..56aecf5e5b2 100644 --- a/source/blender/bmesh/operators/bmo_fill_edgeloop.c +++ b/source/blender/bmesh/operators/bmo_fill_edgeloop.c @@ -114,7 +114,7 @@ void bmo_edgeloop_fill_exec(BMesh *bm, BMOperator *op) v = BM_edge_other_vert(e_next, v); e_prev = e_next; i++; - } while ((v != f_verts[0])); + } while (v != f_verts[0]); if (!BM_face_exists(f_verts, i)) { BMFace *f; diff --git a/source/blender/bmesh/operators/bmo_rotate_edges.c b/source/blender/bmesh/operators/bmo_rotate_edges.c index 50d7014efcd..53efd47ec9a 100644 --- a/source/blender/bmesh/operators/bmo_rotate_edges.c +++ b/source/blender/bmesh/operators/bmo_rotate_edges.c @@ -66,7 +66,7 @@ static float bm_edge_rotate_is_boundary(const BMEdge *e) do { BMEdge *e_iter = l_iter->e; const int e_iter_index = BM_elem_index_get(e_iter); - if ((e_iter_index != -1)) { + if (e_iter_index != -1) { if (count == 1) { return false; } diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c index 08efe5383a8..575a88331da 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c @@ -223,7 +223,7 @@ static void init_laplacian_matrix(LaplacianSystem *sys) sys->vweights[vi_prev] += w1 + w2; sys->vweights[vi_curr] += w2 + w3; sys->vweights[vi_next] += w1 + w3; - } while (((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first)); + } while ((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first); } } @@ -293,7 +293,7 @@ static void fill_laplacian_matrix(LaplacianSystem *sys) ok_prev = ok_curr; ok_curr = ok_next; - } while (((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first)); + } while ((void)(l_curr_index += 1), (l_iter = l_iter->next) != l_first); } BM_ITER_MESH_INDEX (e, &eiter, sys->bm, BM_EDGES_OF_MESH, i) { if (BM_elem_flag_test(e, BM_ELEM_SELECT) || !BM_edge_is_boundary(e)) { diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c index 3d7bacf7080..873b47a7080 100644 --- a/source/blender/bmesh/tools/bmesh_bisect_plane.c +++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c @@ -170,7 +170,7 @@ static void bm_face_bisect_verts( BLI_assert(BM_VERT_DIR(l_iter->v) == 0); /* If both are -1 or 1, or both are zero: don't flip 'inside' var while walking. */ - BM_VERT_SKIP(l_iter->v) = (((BM_VERT_DIR(l_iter->prev->v) ^ BM_VERT_DIR(l_iter->next->v))) == + BM_VERT_SKIP(l_iter->v) = ((BM_VERT_DIR(l_iter->prev->v) ^ BM_VERT_DIR(l_iter->next->v)) == 0); STACK_PUSH(vert_split_arr, l_iter->v); diff --git a/source/blender/bmesh/tools/bmesh_decimate_collapse.c b/source/blender/bmesh/tools/bmesh_decimate_collapse.c index 81a392d38a5..62f472b5146 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_collapse.c +++ b/source/blender/bmesh/tools/bmesh_decimate_collapse.c @@ -304,7 +304,7 @@ static void bm_decim_build_edge_cost_single(BMEdge *e, const float e_weight = 2.0f - (vweights[BM_elem_index_get(e->v1)] + vweights[BM_elem_index_get(e->v2)]); if (e_weight) { - cost += (BM_edge_calc_length(e) * ((e_weight * vweight_factor))); + cost += (BM_edge_calc_length(e) * (e_weight * vweight_factor)); } } diff --git a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c index 41c995a52bf..e209918d6e3 100644 --- a/source/blender/bmesh/tools/bmesh_decimate_dissolve.c +++ b/source/blender/bmesh/tools/bmesh_decimate_dissolve.c @@ -330,7 +330,7 @@ void BM_mesh_decimate_dissolve_ex(BMesh *bm, } while ((BLI_heap_is_empty(eheap) == false) && - (BLI_heap_node_value((enode_top = BLI_heap_top(eheap))) < angle_limit_cos_neg)) { + (BLI_heap_node_value(enode_top = BLI_heap_top(eheap)) < angle_limit_cos_neg)) { BMFace *f_new = NULL; BMEdge *e; diff --git a/source/blender/bmesh/tools/bmesh_edgesplit.c b/source/blender/bmesh/tools/bmesh_edgesplit.c index a703b5338ef..03ff6b39d0e 100644 --- a/source/blender/bmesh/tools/bmesh_edgesplit.c +++ b/source/blender/bmesh/tools/bmesh_edgesplit.c @@ -51,8 +51,8 @@ void BM_mesh_edgesplit(BMesh *bm, */ BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) { if (BM_elem_flag_test(e, BM_ELEM_TAG)) { - if (UNLIKELY(((BM_elem_flag_test(e->v1, BM_ELEM_TAG) == false) && - (BM_elem_flag_test(e->v2, BM_ELEM_TAG) == false)))) { + if (UNLIKELY((BM_elem_flag_test(e->v1, BM_ELEM_TAG) == false) && + (BM_elem_flag_test(e->v2, BM_ELEM_TAG) == false))) { BM_elem_flag_enable(e->v1, BM_ELEM_TAG); BM_elem_flag_enable(e->v2, BM_ELEM_TAG); } |