[Bf-blender-cvs] [b12bf22] master: Correct last commit, check not to split along edges already used
Campbell Barton
noreply at git.blender.org
Tue May 13 10:43:19 CEST 2014
Commit: b12bf2216f1727250032a44237b3476ffec75e45
Author: Campbell Barton
Date: Tue May 13 18:35:14 2014 +1000
https://developer.blender.org/rBb12bf2216f1727250032a44237b3476ffec75e45
Correct last commit, check not to split along edges already used
===================================================================
M source/blender/bmesh/operators/bmo_connect.c
===================================================================
diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 0848ae8..c98777d 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -63,9 +63,13 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f, const bool check_degenera
}
if (!BM_loop_is_adjacent(l_last, l)) {
- BMLoop **l_pair = STACK_PUSH_RET(loops_split);
- l_pair[0] = l_last;
- l_pair[1] = l;
+ BMEdge *e;
+ e = BM_edge_exists(l_last->v, l->v);
+ if (e == NULL || !BMO_elem_flag_test(bm, e, EDGE_OUT)) {
+ BMLoop **l_pair = STACK_PUSH_RET(loops_split);
+ l_pair[0] = l_last;
+ l_pair[1] = l;
+ }
}
l_last = l;
}
More information about the Bf-blender-cvs
mailing list