diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-10 04:38:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-10 04:38:32 +0400 |
| commit | a0469c70304df5d1a19993d554a63c83949af4d1 (patch) | |
| tree | a29702a43aea000a3b135599388db3b1b96d893c /source/blender/blenloader/intern/readfile.c | |
| parent | 569901444031526018332d5e09470d8d7283cf9f (diff) | |
fix [#28860] CRASH loading scene
Sequence strips with missing scenes were missing a NULL check.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ce5805921dc..9ba539acb16 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4494,7 +4494,9 @@ static void lib_link_scene(FileData *fd, Main *main) seq->scene_sound = NULL; if(seq->scene) { seq->scene= newlibadr(fd, sce->id.lib, seq->scene); - seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs); + if(seq->scene) { + seq->scene_sound = sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs); + } } if(seq->scene_camera) seq->scene_camera= newlibadr(fd, sce->id.lib, seq->scene_camera); if(seq->sound) { |