From 1f21efdeac19d57b60554da920935a97d682b9b9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 3 Feb 2013 06:09:29 +0000 Subject: fix [#34073] Combined EdgeLoop slides weirdly on even try concave check on co-linear edges could fail, avoid by using the loop-direction + face normal. --- source/blender/editors/transform/transform.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index f6c9c27dd76..cfa6a72163e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4920,7 +4920,6 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l, /* When there is no edge to slide along, * we must slide along the vector defined by the face we're attach to */ BMLoop *l_tmp = BM_face_vert_share_loop(l_first->f, v); - float tvec[3]; BLI_assert(ELEM(l_tmp->e, e_prev, e_next) && ELEM(l_tmp->prev->e, e_prev, e_next)); @@ -4930,12 +4929,9 @@ static BMLoop *get_next_loop(BMVert *v, BMLoop *l, sub_v3_v3v3(vec_accum, l_tmp->next->next->v->co, v->co); } else { - BM_loop_calc_face_tangent(l_tmp, vec_accum); - if (!BM_loop_is_convex(l_tmp)) { - negate_v3(vec_accum); - } - cross_v3_v3v3(tvec, vec_accum, l_tmp->f->no); - cross_v3_v3v3(vec_accum, l_tmp->f->no, tvec); + float tdir[3]; + BM_loop_calc_face_direction(l_tmp, tdir); + cross_v3_v3v3(vec_accum, l_tmp->f->no, tdir); len_v3_ensure(vec_accum, (BM_edge_calc_length(e_prev) + BM_edge_calc_length(e_next)) / 2.0f); } } -- cgit v1.2.3