[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24560] trunk/blender/source/blender/ blenloader/intern/readfile.c: reload with the active sequence strip set

[Campbell Barton]

Revision: 24560
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24560
Author:   campbellbarton
Date:     2009-11-14 16:31:52 +0100 (Sat, 14 Nov 2009)

Log Message:
-----------
reload with the active sequence strip set

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2009-11-14 14:58:19 UTC (rev 24559)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2009-11-14 15:31:52 UTC (rev 24560)
@@ -4201,11 +4201,6 @@
 					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,8 +4301,9 @@
 		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);