Revision: 31281
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31281
Author: blendix
Date: 2010-08-12 12:17:21 +0200 (Thu, 12 Aug 2010)
Log Message:
-----------
Fix #23235: crash with editmesh instances & drawing, only the object
in object mode should make the editmesh derivedmesh.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/object.c
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2010-08-12
10:15:20 UTC (rev 31280)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2010-08-12
10:17:21 UTC (rev 31281)
@@ -2501,7 +2501,7 @@
/* includes all keys and modifiers */
if(ob->type==OB_MESH) {
- EditMesh *em = BKE_mesh_get_editmesh(ob->data);
+ EditMesh *em = (ob == scene->obedit)?
BKE_mesh_get_editmesh(ob->data): NULL;
/* evaluate drivers */
// XXX: should we push this to derivedmesh
instead?
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
