diff options
| author | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
|---|---|---|
| committer | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
| commit | 97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14 (patch) | |
| tree | fc9746d2210eda08be9d44ae67d5e58d64b48b40 /source/blender/editors/mesh/editmesh_intersect.c | |
| parent | 4a7c203e9ecc7c5b0370afc0fdd6bcc183dc00df (diff) | |
| parent | f3e8326453ae856d7914e45e832a2ed80aa9a9b9 (diff) | |
merge
Diffstat (limited to 'source/blender/editors/mesh/editmesh_intersect.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_intersect.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index fd7cc2733ec..97bd6ee0039 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -60,9 +60,7 @@ static int bm_face_isect_self(BMFace *f, void *UNUSED(user_data)) if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { return 0; } - else { - return -1; - } + return -1; } /** @@ -73,12 +71,10 @@ static int bm_face_isect_pair(BMFace *f, void *UNUSED(user_data)) if (BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { return -1; } - else if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { return 1; } - else { - return 0; - } + return 0; } /** @@ -90,12 +86,10 @@ static int bm_face_isect_pair_swap(BMFace *f, void *UNUSED(user_data)) if (BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { return -1; } - else if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { + if (BM_elem_flag_test(f, BM_ELEM_SELECT)) { return 0; } - else { - return 1; - } + return 1; } /** @@ -515,12 +509,10 @@ static int bm_edge_sort_length_cb(const void *e_a_v, const void *e_b_v) if (val_a > val_b) { return 1; } - else if (val_a < val_b) { + if (val_a < val_b) { return -1; } - else { - return 0; - } + return 0; } static void bm_face_split_by_edges_island_connect( |