[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14221] trunk/blender/source/blender/src/ sequence.c: == Sequencer ==

[Peter Schlaile]

Revision: 14221
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14221
Author:   schlaile
Date:     2008-03-23 19:32:20 +0100 (Sun, 23 Mar 2008)

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

Additional fixes to metastrip handling. The code is now even shorter :)

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2008-03-23 18:08:20 UTC (rev 14220)
+++ trunk/blender/source/blender/src/sequence.c	2008-03-23 18:32:20 UTC (rev 14221)
@@ -420,7 +420,8 @@
 	char str[FILE_MAXDIR+FILE_MAXFILE];
 
 	if (!(seq->type == SEQ_MOVIE || seq->type == SEQ_IMAGE ||
-	      seq->type == SEQ_HD_SOUND || seq->type == SEQ_SCENE)) {
+	      seq->type == SEQ_HD_SOUND || seq->type == SEQ_SCENE ||
+	      seq->type == SEQ_META)) {
 		return;
 	}
 
@@ -430,7 +431,7 @@
 		return;
 	}
 
-	if (seq->type != SEQ_SCENE) {
+	if (seq->type != SEQ_SCENE && seq->type != SEQ_META) {
 		strncpy(str, seq->strip->dir, FILE_MAXDIR-1);
 		strncat(str, seq->strip->stripdata->name, FILE_MAXFILE-1);
 	}
@@ -490,7 +491,6 @@
 		seq->strip->len = seq->len;
 	}
 
-
 	calc_sequence(seq);
 }
 
@@ -1627,19 +1627,8 @@
 		}
 
 		if(!se->ibuf && seq->seqbase.first) {
-			if(cfra < seq->start) {
-				meta_se = do_build_seq_array_recursively(
-					&seq->seqbase, 
-					seq->start, 0);
-			} else if(cfra > seq->start + seq->len - 1) {
-				meta_se = do_build_seq_array_recursively(
-					&seq->seqbase, 
-					seq->start + seq->len - 1, 0);
-			} else {
-				meta_se = do_build_seq_array_recursively(
-					&seq->seqbase, 
-					cfra, 0);
-			}
+			meta_se = do_build_seq_array_recursively(
+				&seq->seqbase, seq->start + se->nr, 0);
 		}
 
 		se->ok = STRIPELEM_OK;