[Bf-blender-cvs] [689e452] master: Recent bmesh face-join caused regression (T48407)

Campbell Barton noreply at git.blender.org
Thu May 12 08:07:07 CEST 2016


Commit: 689e45284be3dcfcd776cfe7f0cf5cc5ed57e285
Author: Campbell Barton
Date:   Thu May 12 16:07:14 2016 +1000
Branches: master
https://developer.blender.org/rB689e45284be3dcfcd776cfe7f0cf5cc5ed57e285

Recent bmesh face-join caused regression (T48407)

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

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 d86e7f6..1d68cdcf 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -1401,9 +1401,7 @@ BMFace *BM_faces_join(BMesh *bm, BMFace **faces, int totface, const bool do_del)
 		}
 
 		for (i = 0; i < BLI_array_count(delverts); i++) {
-			if (delverts[i]->e == NULL) {
-				BM_vert_kill(bm, delverts[i]);
-			}
+			BM_vert_kill(bm, delverts[i]);
 		}
 	}
 	else {




More information about the Bf-blender-cvs mailing list