diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-07 14:12:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-07 14:12:24 +0400 |
| commit | c66b0a32ca3d2c3f1c8800eeafab09a8319d502e (patch) | |
| tree | 9ae923ee910de83f119becc863805b2e92f98440 /source/blender | |
| parent | 9bf395e7cdc277ff578c8e4e11b1f88b13c348f9 (diff) | |
Fix crash in file with image editor that was saved after using scopes.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index be3e3c25b05..689faac505a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4835,6 +4835,9 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene) 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 @@ static void direct_link_screen(FileData *fd, bScreen *sc) 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 |