diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 23:29:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-06 23:29:05 +0400 |
| commit | d1937de1d26992c31407485c7945470627234ebb (patch) | |
| tree | c57f8739cf6b764987cde7c6e14cb1b81b57faf9 /source/blender/bmesh/operators/bmo_join_triangles.c | |
| parent | 31d2ee9bf77bb991ea4779c47379b2cee84b27ed (diff) | |
fix for own error in edge-rotate keeping edge customdata - this was crashing when rotating multiple edges.
Now create the rotate edge in advance and copy its customdata (before joining the faces).
This commit also fixes an annoyance where tryangulating faces could create duplicate edges.
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 433b91c198e..3bb3f036990 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.c +++ b/source/blender/bmesh/operators/bmo_join_triangles.c @@ -331,7 +331,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, TRUE); + BM_faces_join_pair(bm, f1, f2, e); } BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) { @@ -363,7 +363,7 @@ void bmo_join_triangles_exec(BMesh *bm, BMOperator *op) continue; } - BM_faces_join_pair(bm, f1, f2, e, TRUE); + BM_faces_join_pair(bm, f1, f2, e); } } |