diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-10 18:14:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-10 19:47:38 +0300 |
| commit | e525a0680034da16ca085f41f70b9723c8721cc7 (patch) | |
| tree | 71c65f886a081af03a811a367645fe685d411b12 /source/blender | |
| parent | 98123ae91680289255f5fa6cf6ae0ff6dcba251b (diff) | |
BMesh: only remove loose geometry when joining faces
Joining faces could remove faces that happened to share an edge that would normally be removed.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index f7e709ce9cc..70d2e72f80d 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1399,11 +1399,15 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del) /* delete old geometry */ if (do_del) { for (i = 0; i < BLI_array_count(deledges); i++) { - BM_edge_kill(bm, deledges[i]); + if (deledges[i]->l == NULL) { + BM_edge_kill(bm, deledges[i]); + } } for (i = 0; i < BLI_array_count(delverts); i++) { - BM_vert_kill(bm, delverts[i]); + if (delverts[i]->e == NULL) { + BM_vert_kill(bm, delverts[i]); + } } } else { |