[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26074] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: fix for movie files sequence strip names not working unless the first frame of the movie was shown .

Campbell Barton ideasman42 at gmail.com
Mon Jan 18 12:22:32 CET 2010


Revision: 26074
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26074
Author:   campbellbarton
Date:     2010-01-18 12:22:32 +0100 (Mon, 18 Jan 2010)

Log Message:
-----------
fix for movie files sequence strip names not working unless the first frame of the movie was shown.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-01-18 10:45:54 UTC (rev 26073)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2010-01-18 11:22:32 UTC (rev 26074)
@@ -1066,17 +1066,19 @@
 
 StripElem *give_stripelem(Sequence *seq, int cfra)
 {
-	StripElem *se;
-	int nr;
+	StripElem *se= seq->strip->stripdata;
 
-	se = seq->strip->stripdata;
-	nr = give_stripelem_index(seq, cfra);
+	if(seq->type == SEQ_MOVIE) {
+		/* use the first */
+	}
+	else {
+		int nr = give_stripelem_index(seq, cfra);
 
-	if (nr == -1) return 0;
-	if (se == 0) return 0;
-
-	se += nr + seq->anim_startofs; 
+		if (nr == -1) return 0;
+		if (se == 0) return 0;
 	
+		se += nr + seq->anim_startofs;
+	}
 	return se;
 }
 





More information about the Bf-blender-cvs mailing list