Commit: 88a3b686103864c10c7e9dc7a7e1da7bb91a3b67
Author: Campbell Barton
Date: Sun Mar 6 17:24:11 2016 +1100
Branches: blender-v2.77-release
https://developer.blender.org/rB88a3b686103864c10c7e9dc7a7e1da7bb91a3b67
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 84d69fa..7b56d90 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
