diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-11 13:09:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-11 13:12:52 +0300 |
| commit | 4a135ad2b7886c3a4731f7db7ddce60af8068f32 (patch) | |
| tree | 66f2770e426ac33e04cb0dea120c7afec9265542 /source/blender | |
| parent | de72dcadbbea1fe8689f76d1a579066abb22944b (diff) | |
BMesh: correct fix for face-join removing attached faces
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 70d2e72f80d..c03b882abb2 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1288,7 +1288,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del) if (!d1 && !d2 && !BM_ELEM_API_FLAG_TEST(l_iter->e, _FLAG_JF)) { /* don't remove an edge it makes up the side of another face * else this will remove the face as well - campbell */ - if (!BM_edge_face_count_is_over(l_iter->e, 3)) { + if (!BM_edge_face_count_is_over(l_iter->e, 2)) { if (do_del) { BLI_array_append(deledges, l_iter->e); } @@ -1399,9 +1399,7 @@ 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++) { - if (deledges[i]->l == NULL) { - BM_edge_kill(bm, deledges[i]); - } + BM_edge_kill(bm, deledges[i]); } for (i = 0; i < BLI_array_count(delverts); i++) { |