diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 15:37:53 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 15:48:37 +0300 |
commit | 20869065b86263f72e469df17354bd6631be3712 (patch) | |
tree | 9f1aaaa7fecc62200ab48ef551df2510711a2cd7 /source/blender/bmesh/operators | |
parent | f3b8792b963b0b2a00fe7fe173f1beb85c209fbb (diff) |
Cleanup: BMesh, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/bmesh` module.
No functional changes.
Diffstat (limited to 'source/blender/bmesh/operators')
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect_concave.c | 25 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_connect_pair.c | 20 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_edgenet.c | 6 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_inset.c | 12 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_subdivide_edgering.c | 4 |
6 files changed, 26 insertions, 43 deletions
diff --git a/source/blender/bmesh/operators/bmo_connect_concave.c b/source/blender/bmesh/operators/bmo_connect_concave.c index e7b86f102a2..bc1111676a3 100644 --- a/source/blender/bmesh/operators/bmo_connect_concave.c +++ b/source/blender/bmesh/operators/bmo_connect_concave.c @@ -61,23 +61,20 @@ static int bm_edge_length_cmp(const void *a_, const void *b_) if (e_a_concave < e_b_concave) { return -1; } - else if (e_a_concave > e_b_concave) { + if (e_a_concave > e_b_concave) { return 1; } - else { - /* otherwise shortest edges last */ - const float e_a_len = BM_edge_calc_length_squared(e_a); - const float e_b_len = BM_edge_calc_length_squared(e_b); - if (e_a_len < e_b_len) { - return 1; - } - else if (e_a_len > e_b_len) { - return -1; - } - else { - return 0; - } + + /* otherwise shortest edges last */ + const float e_a_len = BM_edge_calc_length_squared(e_a); + const float e_b_len = BM_edge_calc_length_squared(e_b); + if (e_a_len < e_b_len) { + return 1; + } + if (e_a_len > e_b_len) { + return -1; } + return 0; } static bool bm_face_split_by_concave(BMesh *bm, diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index ba8a93ff819..087cd2cd01f 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -155,16 +155,14 @@ static int min_dist_dir_test(MinDistDir *mddir, const float dist_dir[3], const f if (mddir->dist_min[0] == FLT_MAX) { return 0; } - else { - if (dot_v3v3(dist_dir, mddir->dir) > 0.0f) { - if (dist_sq < mddir->dist_min[0]) { - return 0; - } + if (dot_v3v3(dist_dir, mddir->dir) > 0.0f) { + if (dist_sq < mddir->dist_min[0]) { + return 0; } - else { - if (dist_sq < mddir->dist_min[1]) { - return 1; - } + } + else { + if (dist_sq < mddir->dist_min[1]) { + return 1; } } @@ -191,9 +189,7 @@ static int state_isect_co_pair(const PathContext *pc, const float co_a[3], const if ((test_a && test_b) && (test_a != test_b)) { return 1; /* on either side */ } - else { - return 0; - } + return 0; } static int state_isect_co_exact(const PathContext *pc, const float co[3]) diff --git a/source/blender/bmesh/operators/bmo_edgenet.c b/source/blender/bmesh/operators/bmo_edgenet.c index 16bbbd5df88..3ed2e8369e0 100644 --- a/source/blender/bmesh/operators/bmo_edgenet.c +++ b/source/blender/bmesh/operators/bmo_edgenet.c @@ -194,10 +194,8 @@ void bmo_edgenet_prepare_exec(BMesh *bm, BMOperator *op) BLI_array_free(edges2); return; } - else { - edges1 = edges2; - edges2 = NULL; - } + edges1 = edges2; + edges2 = NULL; } if (edges2 && BLI_array_len(edges2) > 2 && diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index 097a7aca383..74a5e365dd5 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -506,9 +506,7 @@ static BMLoop *bm_edge_is_mixed_face_tag(BMLoop *l) return ((tot_tag == 1) && (tot_untag >= 1)) ? l_tag : NULL; } - else { - return NULL; - } + return NULL; } static float bm_edge_info_average_length(BMVert *v, SplitEdgeInfo *edge_info) @@ -530,9 +528,7 @@ static float bm_edge_info_average_length(BMVert *v, SplitEdgeInfo *edge_info) if (tot != 0) { return len / (float)tot; } - else { - return -1.0f; - } + return -1.0f; } /**. @@ -663,9 +659,7 @@ static float bm_edge_info_average_length_with_fallback( if (length != -1.0f) { return length; } - else { - return bm_edge_info_average_length_fallback(v, edge_info, bm, vert_lengths_p); - } + return bm_edge_info_average_length_fallback(v, edge_info, bm, vert_lengths_p); } void bmo_inset_region_exec(BMesh *bm, BMOperator *op) diff --git a/source/blender/bmesh/operators/bmo_subdivide.c b/source/blender/bmesh/operators/bmo_subdivide.c index bf63261fd4d..5e901df3959 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.c +++ b/source/blender/bmesh/operators/bmo_subdivide.c @@ -1276,7 +1276,7 @@ void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op) continue; } - else if (!pat) { + if (!pat) { continue; } diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index b261f018e3e..d72960adf89 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -907,9 +907,7 @@ static void bm_edgering_pair_order(BMesh *bm, if (BM_elem_flag_test(v_other, BM_ELEM_TAG)) { break; } - else { - v_other = NULL; - } + v_other = NULL; } } BLI_assert(v_other != NULL); |