reload with the active sequence strip set
authorCampbell Barton <ideasman42@gmail.com>
Sat, 14 Nov 2009 15:31:52 +0000 (15:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 14 Nov 2009 15:31:52 +0000 (15:31 +0000)
source/blender/blenloader/intern/readfile.c

index 83899473cb4b7ae0bd51168a7e8542f94eb20d19..2850fe63415c4eb0604605633a87475888824528 100644 (file)
@@ -4201,11 +4201,6 @@ static void lib_link_scene(FileData *fd, Main *main)
                                        MEM_freeN(base);
                                }
                        }
-                       
-                       if (sce->ed) {
-                               Editing *ed= sce->ed;
-                               ed->act_seq= NULL; //   ed->act_seq=  newlibadr(fd, ed->act_seq); // FIXME
-                       }
 
                        SEQ_BEGIN(sce->ed, seq) {
                                if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo);
@@ -4306,7 +4301,8 @@ static void direct_link_scene(FileData *fd, Scene *sce)
                ListBase *old_seqbasep= &((Editing *)sce->ed)->seqbase;
                
                ed= sce->ed= newdataadr(fd, sce->ed);
-               ed->act_seq= NULL; //           ed->act_seq=  newdataadr(fd, ed->act_seq); // FIXME
+
+               ed->act_seq= newdataadr(fd, ed->act_seq);
 
                /* recursive link sequences, lb will be correctly initialized */
                link_recurs_seq(fd, &ed->seqbase);