diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 21:23:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 21:23:26 +0400 |
commit | 7b7214c72233f72268f72d31fd8626a0f94e557e (patch) | |
tree | f3d84c26e1f8013d924fca56b4d9184aec046215 /source/blender/editors | |
parent | bffeab99aef22181ea6284381b77fcc85833967c (diff) |
code cleanup - give edge split more helpful var names and replace edgetag macros with static functions.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/mesh/bmesh_select.c | 6 | ||||
-rw-r--r-- | source/blender/editors/mesh/bmesh_tools.c | 9 | ||||
-rw-r--r-- | source/blender/editors/mesh/bmesh_utils.c | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/editors/mesh/bmesh_select.c b/source/blender/editors/mesh/bmesh_select.c index 3ee365d046e..3085a293143 100644 --- a/source/blender/editors/mesh/bmesh_select.c +++ b/source/blender/editors/mesh/bmesh_select.c @@ -335,10 +335,12 @@ static void findnearestvert__doClosest(void *userData, BMVert *eve, int x, int y if (data->dist > 3) { int temp = abs(data->mval[0] - x) + abs(data->mval[1]- y); if (BM_elem_flag_test(eve, BM_ELEM_SELECT) == data->select) { - if (data->strict == 1) + if (data->strict == 1) { return; - else + } + else { temp += 5; + } } if (temp < data->dist) { diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index b1833bc660c..559ad4d4ce2 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -66,10 +66,12 @@ static void add_normal_aligned(float nor[3], const float add[3]) { - if (dot_v3v3(nor, add) < -0.9999f) + if (dot_v3v3(nor, add) < -0.9999f) { sub_v3_v3(nor, add); - else + } + else { sub_v3_v3(nor, add); + } } @@ -2646,8 +2648,9 @@ static int blend_from_shape_exec(bContext *C, wmOperator *op) mul_v3_fl(co, blend); add_v3_v3v3(eve->co, eve->co, co); } - else + else { interp_v3_v3v3(eve->co, eve->co, co, blend); + } copy_v3_v3(sco, co); } diff --git a/source/blender/editors/mesh/bmesh_utils.c b/source/blender/editors/mesh/bmesh_utils.c index 758f3010b84..bee4d4283f6 100644 --- a/source/blender/editors/mesh/bmesh_utils.c +++ b/source/blender/editors/mesh/bmesh_utils.c @@ -686,8 +686,9 @@ UvVertMap *EDBM_make_uv_vert_map(BMEditMesh *em, int selected, int do_face_idx_a iterv->next = newvlist; newvlist = iterv; } - else + else { lastv = iterv; + } iterv = next; } |