From 5fd0c1ed3f54bf960a7f79e0724ef56f8335de18 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 6 Mar 2016 17:24:11 +1100 Subject: [PATCH] BMesh: avoid assert dissolving degenerate faces For dissolving 2-sided faces, theres no need to check they are valid before removal. --- source/blender/bmesh/intern/bmesh_core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 88fcf6a4536..9f680df7e09 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)