[Bf-blender-cvs] [5fd0c1e] master: BMesh: avoid assert dissolving degenerate faces

Campbell Barton noreply at git.blender.org
Sun Mar 6 07:33:46 CET 2016


Commit: 5fd0c1ed3f54bf960a7f79e0724ef56f8335de18
Author: Campbell Barton
Date:   Sun Mar 6 17:24:11 2016 +1100
Branches: master
https://developer.blender.org/rB5fd0c1ed3f54bf960a7f79e0724ef56f8335de18

BMesh: avoid assert dissolving degenerate faces

For dissolving 2-sided faces, theres no need to check they are valid before removal.

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

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 88fcf6a..9f680df 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -872,7 +872,12 @@ void BM_face_kill(BMesh *bm, BMFace *f)
 	BMLoopList *ls, *ls_next;
 #endif
 
-	BM_CHECK_ELEMENT(f);
+#ifdef NDEBUG
+	/* check length since we may be removing degenerate faces */
+	if (f->len >= 3) {
+		BM_CHECK_ELEMENT(f);
+	}
+#endif
 
 #ifdef USE_BMESH_HOLES
 	for (ls = f->loops.first; ls; ls = ls_next)




More information about the Bf-blender-cvs mailing list