Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/transform/transform_convert_sequencer.c
| Show First 20 Lines • Show All 375 Lines • ▼ Show 20 Lines | #else // durian hack | ||||
| seq = ((TransDataSeq *)td->extra)->seq; | seq = ((TransDataSeq *)td->extra)->seq; | ||||
| if ((seq != seq_prev) && (seq->depth == 0) && (seq->flag & SEQ_OVERLAP)) { | if ((seq != seq_prev) && (seq->depth == 0) && (seq->flag & SEQ_OVERLAP)) { | ||||
| overlap = 1; | overlap = 1; | ||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| if (overlap) { | if (overlap) { | ||||
| const bool use_sync_markers = (((SpaceSeq *)t->sa->spacedata.first)->flag & | |||||
| SEQ_MARKER_TRANS) != 0; | |||||
| ListBase *markers = &t->scene->markers; | |||||
| bool has_effect_root = false, has_effect_any = false; | bool has_effect_root = false, has_effect_any = false; | ||||
| for (seq = seqbasep->first; seq; seq = seq->next) { | for (seq = seqbasep->first; seq; seq = seq->next) { | ||||
| seq->tmp = NULL; | seq->tmp = NULL; | ||||
| } | } | ||||
| td = tc->data; | td = tc->data; | ||||
| for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) { | for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) { | ||||
| seq = ((TransDataSeq *)td->extra)->seq; | seq = ((TransDataSeq *)td->extra)->seq; | ||||
| Show All 28 Lines | #else // durian hack | ||||
| for (seq = seqbasep->first; seq; seq = seq->next) { | for (seq = seqbasep->first; seq; seq = seq->next) { | ||||
| if (!(seq->flag & SELECT)) { | if (!(seq->flag & SELECT)) { | ||||
| if (seq->startdisp >= minframe) { | if (seq->startdisp >= minframe) { | ||||
| seq->machine += MAXSEQ * 2; | seq->machine += MAXSEQ * 2; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| BKE_sequence_base_shuffle_time(seqbasep, t->scene); | BKE_sequence_base_shuffle_time(seqbasep, t->scene, markers, use_sync_markers); | ||||
| for (seq = seqbasep->first; seq; seq = seq->next) { | for (seq = seqbasep->first; seq; seq = seq->next) { | ||||
| if (seq->machine >= MAXSEQ * 2) { | if (seq->machine >= MAXSEQ * 2) { | ||||
| seq->machine -= MAXSEQ * 2; | seq->machine -= MAXSEQ * 2; | ||||
| seq->tmp = (void *)1; | seq->tmp = (void *)1; | ||||
| } | } | ||||
| else { | else { | ||||
| seq->tmp = NULL; | seq->tmp = NULL; | ||||
| } | } | ||||
| } | } | ||||
| BKE_sequence_base_shuffle_time(seqbasep, t->scene); | BKE_sequence_base_shuffle_time(seqbasep, t->scene, markers, use_sync_markers); | ||||
| } | } | ||||
| else { | else { | ||||
| BKE_sequence_base_shuffle_time(seqbasep, t->scene); | BKE_sequence_base_shuffle_time(seqbasep, t->scene, markers, use_sync_markers); | ||||
| } | } | ||||
| if (has_effect_any) { | if (has_effect_any) { | ||||
| /* update effects strips based on strips just moved in time */ | /* update effects strips based on strips just moved in time */ | ||||
| td = tc->data; | td = tc->data; | ||||
| for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) { | for (a = 0, seq_prev = NULL; a < tc->data_len; a++, td++, seq_prev = seq) { | ||||
| seq = ((TransDataSeq *)td->extra)->seq; | seq = ((TransDataSeq *)td->extra)->seq; | ||||
| if ((seq != seq_prev)) { | if ((seq != seq_prev)) { | ||||
| ▲ Show 20 Lines • Show All 318 Lines • Show Last 20 Lines | |||||