Revision: 32453
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32453
Author:   nazgul
Date:     2010-10-13 21:56:53 +0200 (Wed, 13 Oct 2010)

Log Message:
-----------
Fix #24234: Object deletion doesn't take into account its users (causes 
segfault)

Clear SELECT flag when deleting object -- object could be used in other scenes, 
and
some stuff (like translation) would be confused due to relations

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c    2010-10-13 
14:44:22 UTC (rev 32452)
+++ trunk/blender/source/blender/editors/object/object_add.c    2010-10-13 
19:56:53 UTC (rev 32453)
@@ -817,6 +817,10 @@
        CTX_DATA_BEGIN(C, Base*, base, selected_bases) {
 
                if(base->object->type==OB_LAMP) islamp= 1;
+
+               /* deselect object -- it could be used in other scenes */
+               base->object->flag &= ~SELECT;
+
                /* remove from current scene only */
                ED_base_object_free_and_unlink(bmain, scene, base);
        }


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to