Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BMesh: only remove loose geometry when joining faces

Browse Source 
Joining faces could remove faces that happened to share an edge that would normally be removed.
This commit is contained in:
Campbell Barton
2016-05-11 01:14:46 +10:00
parent 98123ae916
commit e525a06800
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/bmesh/intern/bmesh_core.c
View File

@@ -1399,11 +1399,15 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del)
/* delete old geometry */ /* delete old geometry */
if (do_del) { if (do_del) {
for (i = 0; i < BLI_array_count(deledges); i++) { 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++) { 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 { else {