diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-26 12:06:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-26 12:06:13 +0400 |
| commit | 4ade85612c95c81d3d45826a93bd24ee9c3c9dd4 (patch) | |
| tree | 01c8a7d23397b920b4a4c89d6e9d5cd3e36f3795 /source/blender/blenloader | |
| parent | c6c8b283facb1d7482e9b14525f787fcc3f6c1c2 (diff) | |
fix for possible crash - freed scene was being used for render result lookup when 'Load UI' was disabled.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 502ffbd15b8..eb7711de9b1 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5560,6 +5560,10 @@ void lib_link_screen_restore(Main *newmain, bScreen *curscreen, Scene *curscene) 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; |