From dc12dd23f686f78f0765637f8a2b2607da95dece Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 23 Jun 2013 09:50:10 +0000 Subject: [PATCH] fix for connect_pair cutting across triangle verts from edges. --- source/blender/bmesh/operators/bmo_connect_pair.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index 8ffa064a843..7db7af4e9e5 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -170,14 +170,14 @@ static void state_link_add(PathContext *pc, PathLinkState *state, BLI_assert(0); } - if (ele_prev == NULL) { + if (ele_from == NULL) { printf("from NULL\n"); } - else if (ele_prev->head.htype == BM_EDGE) { - printf("from edge %d\n", BM_elem_index_get(ele_prev)); + else if (ele_from->head.htype == BM_EDGE) { + printf("from edge %d\n", BM_elem_index_get(ele_from)); } - else if (ele_prev->head.htype == BM_FACE) { - printf("from face %d\n", BM_elem_index_get(ele_prev)); + else if (ele_from->head.htype == BM_FACE) { + printf("from face %d\n", BM_elem_index_get(ele_from)); } else { BLI_assert(0); @@ -286,6 +286,8 @@ static bool state_step(PathContext *pc, PathLinkState *state) else { state = state_step__face_edges(pc, state, &state_orig, l_start->next, l_start); + state = state_step__face_verts(pc, state, &state_orig, + l_start->next->next, l_start); } } }