- sequence strips without scenes would crash on display

[blender.git] / source / blender / blenloader / intern / readfile.c

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f2621a1b4491eccba11d336cf8b198714538c3a9..9548db3278a5dc93d642bff54c34da76123a96d3 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4232,6 +4232,7 @@ static void lib_link_scene(FileData *fd, Main *main)
                                if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
                                if(seq->scene) seq->scene= newlibadr(fd, sce->id.lib, seq->scene);
                                if(seq->sound) {
+                                       seq->sound_handle= NULL;
                                        if(seq->type == SEQ_HD_SOUND)
                                                seq->type = SEQ_SOUND;
                                        else
@@ -11281,6 +11282,16 @@ static void expand_scene(FileData *fd, Main *mainvar, Scene *sce)
        if(sce->gpd)
                expand_doit(fd, mainvar, sce->gpd);
 
+       if(sce->ed) {
+               Sequence *seq;
+
+               SEQ_BEGIN(sce->ed, seq) {
+                       if(seq->scene) expand_doit(fd, mainvar, seq->scene);
+                       if(seq->sound) expand_doit(fd, mainvar, seq->sound);
+               }
+               SEQ_END
+       }
+
 #ifdef DURIAN_CAMERA_SWITCH
        {
                TimeMarker *marker;