archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Sequencer ==

Browse Source 
Additional fixes to metastrip handling. The code is now even shorter :)
This commit is contained in:
Peter Schlaile
2008-03-23 18:32:20 +00:00
parent a572fb0e45
commit 0f8fee26cf
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/src/sequence.c
View File

@@ -420,7 +420,8 @@ void reload_sequence_new_file(Sequence * seq)
char str[FILE_MAXDIR+FILE_MAXFILE]; char str[FILE_MAXDIR+FILE_MAXFILE];
if (!(seq->type == SEQ_MOVIE || seq->type == SEQ_IMAGE || 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; return;
} }
@@ -430,7 +431,7 @@ void reload_sequence_new_file(Sequence * seq)
return; return;
} }
if (seq->type != SEQ_SCENE) { if (seq->type != SEQ_SCENE && seq->type != SEQ_META) {
strncpy(str, seq->strip->dir, FILE_MAXDIR-1); strncpy(str, seq->strip->dir, FILE_MAXDIR-1);
strncat(str, seq->strip->stripdata->name, FILE_MAXFILE-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; seq->strip->len = seq->len;
} }
calc_sequence(seq); 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(!se->ibuf && seq->seqbase.first) {
if(cfra < seq->start) { meta_se = do_build_seq_array_recursively(
meta_se = do_build_seq_array_recursively( &seq->seqbase, seq->start + se->nr, 0);
&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);
}
} }
se->ok = STRIPELEM_OK; se->ok = STRIPELEM_OK;