blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 744 Projects 19 Wiki Activity

Fix T48649: VSE meta-strip overlap shuffles recursively

This commit is contained in:
Campbell Barton 2016-06-14 21:55:39 +10:00
parent 180aad5e0b
commit 424f41ad1c
Notes: blender-bot 2023-02-14 08:45:09 +01:00 
Referenced by issue #48649, Metastrip bug
Referenced by issue #48651, Allow CUDA GPU rendering to use host memory
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/transform/transform_conversions.c
View File

@ -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);