[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45160] trunk/blender/source/blender/ blenloader/intern/readfile.c: fix for possible crash - freed scene was being used for render result lookup when 'Load UI' was disabled.
Campbell Barton
ideasman42 at gmail.com
Mon Mar 26 10:06:29 CEST 2012
Revision: 45160
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45160
Author: campbellbarton
Date: 2012-03-26 08:06:13 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
fix for possible crash - freed scene was being used for render result lookup when 'Load UI' was disabled.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-03-26 07:51:47 UTC (rev 45159)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-03-26 08:06:13 UTC (rev 45160)
@@ -5560,6 +5560,10 @@
sima->image= restore_pointer_by_name(newmain, (ID *)sima->image, 1);
+ /* this will be freed, not worth attempting to find same scene,
+ * since it gets initialized later */
+ sima->iuser.scene = NULL;
+
sima->scopes.waveform_1 = NULL;
sima->scopes.waveform_2 = NULL;
sima->scopes.waveform_3 = NULL;
More information about the Bf-blender-cvs
mailing list