diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:21:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-31 16:22:52 +0300 |
commit | aba4e6810f8b4d0e459137b64e061a2cadc457d1 (patch) | |
tree | 2b6159c7ba0f23c020600b71276772fa4a882b5b /source/blender/bmesh | |
parent | 72a563cdee8fef198a200ff65b57ddb847c01795 (diff) |
Cleanup: style, use braces in source/ (include disabled blocks)
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_query.c | 3 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_beautify.c | 27 |
4 files changed, 24 insertions, 12 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 888393de47a..c28d748b2eb 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -128,8 +128,9 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v) BMLoop *l_a = BM_face_vert_share_loop(e->l->f, v); BMLoop *l_b = (e->l->v == v) ? e->l->next : e->l; - if (!BM_face_split(bm, e->l->f, l_a, l_b, NULL, NULL, false)) + if (!BM_face_split(bm, e->l->f, l_a, l_b, NULL, NULL, false)) { return false; + } if (!BM_disk_dissolve(bm, v)) { return false; diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index 84c177a4d04..2ec3ba4b91c 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -734,8 +734,9 @@ void *bmo_slot_buffer_grow(BMesh *bm, BMOperator *op, int slot_code, int totadd) BLI_assert(slot->slottype == BMO_OP_SLOT_ELEMENT_BUF); /* check if its actually a buffer */ - if (slot->slottype != BMO_OP_SLOT_ELEMENT_BUF) + if (slot->slottype != BMO_OP_SLOT_ELEMENT_BUF) { return NULL; + } if (slot->flag & BMOS_DYNAMIC_ARRAY) { if (slot->len >= slot->size) { diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index a2f95a013a2..479dc99beee 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -1926,8 +1926,9 @@ BMEdge *BM_edge_exists(BMVert *v_a, BMVert *v_b) BLI_assert(v_a->head.htype == BM_VERT && v_b->head.htype == BM_VERT); BM_ITER_ELEM (e, &iter, v_a, BM_EDGES_OF_VERT) { - if (e->v1 == v_b || e->v2 == v_b) + if (e->v1 == v_b || e->v2 == v_b) { return e; + } } return NULL; diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c index 00368364616..5d511374989 100644 --- a/source/blender/bmesh/tools/bmesh_beautify.c +++ b/source/blender/bmesh/tools/bmesh_beautify.c @@ -66,24 +66,33 @@ static int erot_gsetutil_cmp(const void *a, const void *b) { const EdRotState *e_state_a = (const EdRotState *)a; const EdRotState *e_state_b = (const EdRotState *)b; - if (e_state_a->v1 < e_state_b->v1) + if (e_state_a->v1 < e_state_b->v1) { return -1; - else if (e_state_a->v1 > e_state_b->v1) + } + else if (e_state_a->v1 > e_state_b->v1) { return 1; - else if (e_state_a->v2 < e_state_b->v2) + } + else if (e_state_a->v2 < e_state_b->v2) { return -1; - else if (e_state_a->v2 > e_state_b->v2) + } + else if (e_state_a->v2 > e_state_b->v2) { return 1; - else if (e_state_a->f1 < e_state_b->f1) + } + else if (e_state_a->f1 < e_state_b->f1) { return -1; - else if (e_state_a->f1 > e_state_b->f1) + } + else if (e_state_a->f1 > e_state_b->f1) { return 1; - else if (e_state_a->f2 < e_state_b->f2) + } + else if (e_state_a->f2 < e_state_b->f2) { return -1; - else if (e_state_a->f2 > e_state_b->f2) + } + else if (e_state_a->f2 > e_state_b->f2) { return 1; - else + } + else { return 0; + } } #endif static GSet *erot_gset_new(void) |