diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-14 14:55:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-06-14 14:57:55 +0300 |
| commit | 424f41ad1c9f42cf274a8255d36f999994a99759 (patch) | |
| tree | 029828eb0bdfaa757ba751b4837c782742a5a7c1 /source/blender/editors | |
| parent | 180aad5e0bb580239092da81017dc75547f5ed48 (diff) | |
Fix T48649: VSE meta-strip overlap shuffles recursively
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 56d742ff345..f7c3bc1820b 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4936,7 +4936,7 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data) td = t->data; for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) { seq = ((TransDataSeq *)td->extra)->seq; - if ((seq != seq_prev)) { + if ((seq != seq_prev) && (seq->depth == 0)) { /* check effects strips, we cant change their time */ if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) { has_effect = true; @@ -4955,7 +4955,7 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data) td = t->data; for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) { seq = ((TransDataSeq *)td->extra)->seq; - if ((seq != seq_prev)) { + if ((seq != seq_prev) && (seq->depth == 0)) { minframe = min_ii(minframe, seq->startdisp); } } @@ -5003,7 +5003,7 @@ static void freeSeqData(TransInfo *t, TransCustomData *custom_data) td = t->data; for (a = 0, seq_prev = NULL; a < t->total; a++, td++, seq_prev = seq) { seq = ((TransDataSeq *)td->extra)->seq; - if ((seq != seq_prev)) { + if ((seq != seq_prev) && (seq->depth == 0)) { if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) { if (BKE_sequence_test_overlap(seqbasep, seq)) { BKE_sequence_base_shuffle(seqbasep, seq, t->scene); |