From 4fc6ef1cf57a48626cbfa7fd9cc09de9bec29f92 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 8 Apr 2012 08:09:37 +0000 Subject: style cleanup: pep8 some C/style --- source/blender/bmesh/intern/bmesh_structure.c | 4 ++-- source/blender/bmesh/operators/bmo_connect.c | 5 +++-- source/blender/editors/mesh/editmesh_slide.c | 9 +++++---- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'source/blender') diff --git a/source/blender/bmesh/intern/bmesh_structure.c b/source/blender/bmesh/intern/bmesh_structure.c index aa5c8b81c2a..7fcd6f39fb8 100644 --- a/source/blender/bmesh/intern/bmesh_structure.c +++ b/source/blender/bmesh/intern/bmesh_structure.c @@ -547,8 +547,8 @@ int bmesh_loop_validate(BMFace *f) /* Validate that the face loop cycle is the length specified by f->len */ for (i = 1, l_iter = l_first->next; i < len; i++, l_iter = l_iter->next) { - if ( (l_iter->f != f) || - (l_iter == l_first)) + if ((l_iter->f != f) || + (l_iter == l_first)) { return FALSE; } diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c index 07be4cdd5c1..69a9b75b258 100644 --- a/source/blender/bmesh/operators/bmo_connect.c +++ b/source/blender/bmesh/operators/bmo_connect.c @@ -147,11 +147,12 @@ static BMVert *get_outer_vert(BMesh *bm, BMEdge *e) /* Clamp x to the interval {0..len-1}, with wrap-around */ static int clamp_index(const int x, const int len) { - if (x >= 0) + if (x >= 0) { return x % len; + } else { int r = len - (-x % len); - if(r == len) + if (r == len) return len - 1; else return r; diff --git a/source/blender/editors/mesh/editmesh_slide.c b/source/blender/editors/mesh/editmesh_slide.c index 063690a5d9d..94c546f0f1b 100644 --- a/source/blender/editors/mesh/editmesh_slide.c +++ b/source/blender/editors/mesh/editmesh_slide.c @@ -198,7 +198,7 @@ static void vtx_slide_confirm(bContext *C, wmOperator *op) /* Invoke operator */ edbm_vert_slide_exec(C, op); - if(vso->snap_n_merge) { + if (vso->snap_n_merge) { float other_d; BMVert* other = BM_edge_other_vert(vso->sel_edge, vso->start_vtx); other_d = len_v3v3(vso->interp, other->co); @@ -209,9 +209,10 @@ static void vtx_slide_confirm(bContext *C, wmOperator *op) BM_vert_select_set(bm, vso->start_vtx, TRUE); EDBM_op_callf(em, op, "pointmerge verts=%hv mergeco=%v", BM_ELEM_SELECT, other->co); EDBM_flag_disable_all(em, BM_ELEM_SELECT); - } else { + } + else { /* Store in historty if not merging */ - EDBM_editselection_store(em, &vso->start_vtx->head); + EDBM_editselection_store(em, &vso->start_vtx->head); } } else { @@ -247,7 +248,7 @@ static void vtx_slide_exit(const bContext *C, wmOperator *op) MEM_freeN(vso->edge_frame); } - if(vso->vtx_frame) { + if (vso->vtx_frame) { MEM_freeN(vso->vtx_frame); } -- cgit v1.2.3