[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24071] trunk/blender/source/blender/ makesrna/intern/rna_object.c: bugfix [#19719] segfault assigning a different mesh to object in edit mode

[Campbell Barton]

Revision: 24071
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24071
Author:   campbellbarton
Date:     2009-10-25 00:41:40 +0200 (Sun, 25 Oct 2009)

Log Message:
-----------
bugfix [#19719] segfault assigning a different mesh to object in edit mode

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c   2009-10-24 
14:22:46 UTC (rev 24070)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c   2009-10-24 
22:41:40 UTC (rev 24071)
@@ -183,7 +183,7 @@
        Object *ob= (Object*)ptr->data;
        ID *id= value.data;
 
-       if(ob->type == OB_EMPTY || id == NULL)
+       if(ob->type == OB_EMPTY || id == NULL || ob->mode & OB_MODE_EDIT)
                return;
        
        if(ob->type == OB_MESH) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs