[Bf-blender-cvs] [e525a06] master: BMesh: only remove loose geometry when joining faces

[Campbell Barton]

Commit: e525a0680034da16ca085f41f70b9723c8721cc7
Author: Campbell Barton
Date:   Wed May 11 01:14:46 2016 +1000
Branches: master
https://developer.blender.org/rBe525a0680034da16ca085f41f70b9723c8721cc7

BMesh: only remove loose geometry when joining faces

Joining faces could remove faces that happened to share an edge that would normally be removed.

===================================================================

M	source/blender/bmesh/intern/bmesh_core.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index f7e709c..70d2e72 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 {