diff options
author | Peter Schlaile <peter@schlaile.de> | 2008-03-23 21:32:20 +0300 |
---|---|---|
committer | Peter Schlaile <peter@schlaile.de> | 2008-03-23 21:32:20 +0300 |
commit | 0f8fee26cf8984f666bcbfdb97d5d79b5e100227 (patch) | |
tree | 22353da998c27116d6e91bc28443964ce5f85c52 /source/blender/src/sequence.c | |
parent | a572fb0e45bd3ae1a1d5546028c5b6cbc8f00feb (diff) |
== Sequencer ==
Additional fixes to metastrip handling. The code is now even shorter :)
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r-- | source/blender/src/sequence.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c index fd2c6779739..667fb15e913 100644 --- a/source/blender/src/sequence.c +++ b/source/blender/src/sequence.c @@ -420,7 +420,8 @@ void reload_sequence_new_file(Sequence * seq) 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 @@ void reload_sequence_new_file(Sequence * seq) 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 @@ void reload_sequence_new_file(Sequence * seq) seq->strip->len = seq->len; } - calc_sequence(seq); } @@ -1627,19 +1627,8 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra, } 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; |