Commit: 424f41ad1c9f42cf274a8255d36f999994a99759
Author: Campbell Barton
Date: Tue Jun 14 21:55:39 2016 +1000
Branches: master
https://developer.blender.org/rB424f41ad1c9f42cf274a8255d36f999994a99759
Fix T48649: VSE meta-strip overlap shuffles recursively
===================================================================
M source/blender/editors/transform/transform_conversions.c
===================================================================
diff --git a/source/blender/editors/transform/transform_conversions.c
b/source/blender/editors/transform/transform_conversions.c
index 56d742f..f7c3bc1 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
