diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-03-24 09:37:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-03-24 09:37:10 +0400 |
commit | b69809c820ffde1627ca85915657e8c23f2cb7ca (patch) | |
tree | 4bab9efb2c45c6e819c3380041f68a0c50fe1326 /source/blender/bmesh/intern | |
parent | 32d5d072a0bf629c97af3263b79e535203a9e52b (diff) |
Fix T39331: Dissolve vertex crash
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mods.c | 18 |
1 files changed, 10 insertions, 8 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 (f != f2) { - /* join two remaining faces */ - if (!BM_faces_join_pair(bm, f, f2, e, true)) { - return false; + 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; + } } } } |