griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for connect_pair cutting across triangle verts from edges.

Browse Source
This commit is contained in:
Campbell Barton
2013-06-23 09:50:10 +00:00
parent adba695209
commit dc12dd23f6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/bmesh/operators/bmo_connect_pair.c
View File

@@ -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);
}
}
}