Revision: 42451
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42451
Author: campbellbarton
Date: 2011-12-06 03:31:28 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
fix for crash calling rotate edge on a completely selected torus.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
2011-12-06 02:24:30 UTC (rev 42450)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
2011-12-06 03:31:28 UTC (rev 42451)
@@ -673,7 +673,10 @@
return NULL;
f = BM_Join_TwoFaces(bm, e->l->f, e->l->radial_next->f, e);
-
+
+ if (f == NULL)
+ return NULL;
+
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
if (l->v == v1)
l1 = l;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
2011-12-06 02:24:30 UTC (rev 42450)
+++ branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c
2011-12-06 03:31:28 UTC (rev 42451)
@@ -118,11 +118,13 @@
if (fac1 > fac2) {
e = BM_Rotate_Edge(bm, e, 0);
- BMO_SetFlag(bm, e, ELE_NEW);
-
- BMO_SetFlag(bm, e->l->f,
FACE_MARK|ELE_NEW);
- BMO_SetFlag(bm, e->l->radial_next->f,
FACE_MARK|ELE_NEW);
- stop = 0;
+ if (e) {
+ BMO_SetFlag(bm, e, ELE_NEW);
+
+ BMO_SetFlag(bm, e->l->f,
FACE_MARK|ELE_NEW);
+ BMO_SetFlag(bm,
e->l->radial_next->f, FACE_MARK|ELE_NEW);
+ stop = 0;
+ }
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
