svn merge ^/trunk/blender -r40872:40890
[blender.git] / source / blender / blenloader / intern / readfile.c
index 6530f25f3499d9fa1ea4d92520f9b83cfb0dd156..91b17d783ab4276ad019085a048aea07501c8a1c 100644 (file)
@@ -4560,7 +4560,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) {