diff options
Diffstat (limited to 'source/blender/blenkernel/intern/sequence.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequence.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/sequence.c b/source/blender/blenkernel/intern/sequence.c index 48eb58687da..1ab085f5fa8 100644 --- a/source/blender/blenkernel/intern/sequence.c +++ b/source/blender/blenkernel/intern/sequence.c @@ -1156,7 +1156,7 @@ static int seq_proxy_get_fname(Scene *scene, Sequence * seq, int cfra, char * na return TRUE; } - /* generate a seperate proxy directory for each preview size */ + /* generate a separate proxy directory for each preview size */ if (seq->type == SEQ_IMAGE) { StripElem * se = give_stripelem(seq, cfra); @@ -1285,7 +1285,7 @@ static void seq_proxy_build_frame(Scene *scene, Sequence * seq, int cfra, int re IMB_scalefastImBuf(ibuf, (short)rectx, (short)recty); } - /* quality is fixed, otherwise one has to generate seperate + /* quality is fixed, otherwise one has to generate separate directories for every quality... depth = 32 is intentionally left in, otherwise ALPHA channels @@ -3425,7 +3425,7 @@ static int shuffle_seq_time_offset_test(ListBase * seqbasep, char dir) for(seq= seqbasep->first; seq; seq= seq->next) { if(seq->tmp) { for(seq_other= seqbasep->first; seq_other; seq_other= seq_other->next) { - if(seq_overlap(seq, seq_other)) { + if(!seq_other->tmp && seq_overlap(seq, seq_other)) { if(dir=='L') { offset= MIN2(offset, seq_other->startdisp - seq->enddisp); } |