diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-04 18:48:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-04 18:48:10 +0400 |
commit | 1635d8e873eff8d49e7871047ca8b5c026cdf214 (patch) | |
tree | 44f23419857f60e19cd0cdffb3ce42491db01d6f /source/blender/bmesh/operators/bmo_join_triangles.c | |
parent | c93c8bda3de90bb516f45b34531f07a8365a65d1 (diff) |
add option not to delete edges/verts when joining faces, needed so we can loop over edges and join them without having to check if they have been removed.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_join_triangles.c')
-rw-r--r-- | source/blender/bmesh/operators/bmo_join_triangles.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/bmesh/operators/bmo_join_triangles.c b/source/blender/bmesh/operators/bmo_join_triangles.c index dda3e144220..e7de0044ab4 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -333,7 +333,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op) BM_edge_face_pair(e, &f1, &f2); /* checked above */ - BM_faces_join_pair(bm, f1, f2, e); + BM_faces_join_pair(bm, f1, f2, e, TRUE); } BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { @@ -365,7 +365,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op) continue; } - BM_faces_join_pair(bm, f1, f2, e); + BM_faces_join_pair(bm, f1, f2, e, TRUE); } } |