Revision: 28067
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28067
Author: blendix
Date: 2010-04-07 12:12:24 +0200 (Wed, 07 Apr 2010)
Log Message:
-----------
Fix crash in file with image editor that was saved after using scopes.
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 2010-04-07
09:35:14 UTC (rev 28066)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-04-07
10:12:24 UTC (rev 28067)
@@ -4835,6 +4835,9 @@
sima->image=
restore_pointer_by_name(newmain, (ID *)sima->image, 1);
sima->scopes.samples_ibuf = NULL;
+ sima->scopes.waveform_1 = NULL;
+ sima->scopes.waveform_2 = NULL;
+ sima->scopes.waveform_3 = NULL;
sima->scopes.ok = 0;
/* NOTE: pre-2.5, this was local data
not lib data, but now we need this as lib data
@@ -5109,6 +5112,9 @@
sima->iuser.scene= NULL;
sima->iuser.ok= 1;
sima->scopes.samples_ibuf = NULL;
+ sima->scopes.waveform_1 = NULL;
+ sima->scopes.waveform_2 = NULL;
+ sima->scopes.waveform_3 = NULL;
sima->scopes.ok = 0;
/* WARNING: gpencil data is no longer stored
directly in sima after 2.5
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
