[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26762] trunk/blender/source/blender: [ #20958] API: crash on mesh.update() if I unlink and link meshes with the same name twice

Campbell Barton ideasman42 at gmail.com
Wed Feb 10 10:30:22 CET 2010


Revision: 26762
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26762
Author:   campbellbarton
Date:     2010-02-10 10:30:22 +0100 (Wed, 10 Feb 2010)

Log Message:
-----------
[#20958] API: crash on mesh.update() if I unlink and link meshes with the same name twice

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sound.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c	2010-02-10 09:18:49 UTC (rev 26761)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c	2010-02-10 09:30:22 UTC (rev 26762)
@@ -29,6 +29,7 @@
 #include "BKE_library.h"
 #include "BKE_packedFile.h"
 #include "BKE_fcurve.h"
+#include "BKE_animsys.h"
 
 #include "RNA_access.h"
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-02-10 09:18:49 UTC (rev 26761)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2010-02-10 09:30:22 UTC (rev 26762)
@@ -169,6 +169,10 @@
 	/* as long as ED_base_object_free_and_unlink calls free_libblock_us, we don't have to decrement ob->id.us */
 	ED_base_object_free_and_unlink(scene, base);
 
+	/* needed otherwise the depgraph will contain free'd objects which can crash, see [#20958] */
+	DAG_scene_sort(scene);
+	DAG_ids_flush_update(0);
+
 	WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
 }
 





More information about the Bf-blender-cvs mailing list