[Bf-blender-cvs] [b69809c] master: Fix T39331: Dissolve vertex crash
Campbell Barton
noreply at git.blender.org
Mon Mar 24 06:37:59 CET 2014
Commit: b69809c820ffde1627ca85915657e8c23f2cb7ca
Author: Campbell Barton
Date: Mon Mar 24 16:37:10 2014 +1100
https://developer.blender.org/rBb69809c820ffde1627ca85915657e8c23f2cb7ca
Fix T39331: Dissolve vertex crash
===================================================================
M source/blender/bmesh/intern/bmesh_mods.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index 9696eb6..a619947 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;
+ }
}
}
}
More information about the Bf-blender-cvs
mailing list