[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20540] trunk/blender/source/blender/ blenloader/intern/readfile.c: == Sequencer ==

Peter Schlaile peter at schlaile.de
Sun May 31 19:59:57 CEST 2009


Revision: 20540
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20540
Author:   schlaile
Date:     2009-05-31 19:59:57 +0200 (Sun, 31 May 2009)

Log Message:
-----------
== Sequencer ==

This fixes: IPO pinning on sequencer strips was lost during Undo.

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-05-31 17:44:38 UTC (rev 20539)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2009-05-31 17:59:57 UTC (rev 20540)
@@ -4091,12 +4091,14 @@
 				}
 				else if(sl->spacetype==SPACE_IPO) {
 					SpaceIpo *sipo= (SpaceIpo *)sl;
+
+					sipo->ipo= restore_pointer_by_name(newmain, (ID *)sipo->ipo, 0);
+					if(sipo->blocktype==ID_SEQ) 
+						sipo->from= find_sequence_from_ipo_helper(newmain, sipo->ipo);
+					else 
+						sipo->from= restore_pointer_by_name(newmain, (ID *)sipo->from, 0);
 					
-					if(sipo->blocktype==ID_SEQ) sipo->from= NULL;	// no libdata
-					else sipo->from= restore_pointer_by_name(newmain, (ID *)sipo->from, 0);
-					
 					// not free sipo->ipokey, creates dependency with src/
-					sipo->ipo= restore_pointer_by_name(newmain, (ID *)sipo->ipo, 0);
 					if(sipo->editipo) MEM_freeN(sipo->editipo);
 					sipo->editipo= NULL;
 				}





More information about the Bf-blender-cvs mailing list