From b69809c820ffde1627ca85915657e8c23f2cb7ca Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 24 Mar 2014 16:37:10 +1100 Subject: [PATCH] Fix T39331: Dissolve vertex crash --- source/blender/bmesh/intern/bmesh_mods.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c index 9696eb69165..a619947ddc9 100644 --- a/source/blender/bmesh/intern/bmesh_mods.c +++ b/source/blender/bmesh/intern/bmesh_mods.c @@ -205,14 +205,16 @@ bool BM_disk_dissolve(BMesh *bm, BMVert *v) return false; } - /* get remaining two faces */ - f = e->l->f; - f2 = e->l->radial_next->f; + if (e->l) { + /* get remaining two faces */ + f = e->l->f; + f2 = e->l->radial_next->f; - if (f != f2) { - /* join two remaining faces */ - if (!BM_faces_join_pair(bm, f, f2, e, true)) { - return false; + if (f != f2) { + /* join two remaining faces */ + if (!BM_faces_join_pair(bm, f, f2, e, true)) { + return false; + } } } }