[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25558] trunk/blender/source/blender/ blenkernel/intern/scene.c: fix for accessing invalid memory when loading a new file.
Campbell Barton
ideasman42 at gmail.com
Sat Dec 26 00:50:35 CET 2009
Revision: 25558
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25558
Author: campbellbarton
Date: 2009-12-26 00:50:35 +0100 (Sat, 26 Dec 2009)
Log Message:
-----------
fix for accessing invalid memory when loading a new file.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/scene.c
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2009-12-25 22:58:11 UTC (rev 25557)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2009-12-25 23:50:35 UTC (rev 25558)
@@ -249,7 +249,12 @@
/* do not free objects! */
if(sce->gpd) {
+#if 0 // removed since this can be invalid memory when freeing everything
+ // since the grease pencil data is free'd before the scene.
+ // since grease pencil data is not (yet?), shared between objects
+ // its probably safe not to do this, some save and reload will free this.
sce->gpd->id.us--;
+#endif
sce->gpd= NULL;
}
More information about the Bf-blender-cvs
mailing list