Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/transform/transform_convert_sequencer.c
| Show First 20 Lines • Show All 394 Lines • ▼ Show 20 Lines | else { | ||||
| SEQ_transform_seqbase_shuffle_time( | SEQ_transform_seqbase_shuffle_time( | ||||
| standalone_strips, seqbasep, t->scene, markers, use_sync_markers); | standalone_strips, seqbasep, t->scene, markers, use_sync_markers); | ||||
| SEQ_collection_free(standalone_strips); | SEQ_collection_free(standalone_strips); | ||||
| } | } | ||||
| if (seq_transform_check_strip_effects(transformed_strips)) { | if (seq_transform_check_strip_effects(transformed_strips)) { | ||||
| /* Update effect strips based on strips just moved in time. */ | /* Update effect strips based on strips just moved in time. */ | ||||
| seq_transform_update_effects(t, transformed_strips); | seq_transform_update_effects(t, transformed_strips); | ||||
| } | |||||
| /* If any effects still overlap, we need to move them up. */ | /* If any effects still overlap, we need to move them up. | ||||
| * In some cases other strips can be overlapping still, see T90646. */ | |||||
| Sequence *seq; | Sequence *seq; | ||||
| SEQ_ITERATOR_FOREACH (seq, transformed_strips) { | SEQ_ITERATOR_FOREACH (seq, transformed_strips) { | ||||
| if ((seq->type & SEQ_TYPE_EFFECT) && seq->seq1) { | |||||
| if (SEQ_transform_test_overlap(seqbasep, seq)) { | if (SEQ_transform_test_overlap(seqbasep, seq)) { | ||||
| SEQ_transform_seqbase_shuffle(seqbasep, seq, t->scene); | SEQ_transform_seqbase_shuffle(seqbasep, seq, t->scene); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | |||||
| } | |||||
| static SeqCollection *seq_transform_collection_from_transdata(TransDataContainer *tc) | static SeqCollection *seq_transform_collection_from_transdata(TransDataContainer *tc) | ||||
| { | { | ||||
| SeqCollection *collection = SEQ_collection_create(__func__); | SeqCollection *collection = SEQ_collection_create(__func__); | ||||
| TransData *td = tc->data; | TransData *td = tc->data; | ||||
| for (int a = 0; a < tc->data_len; a++, td++) { | for (int a = 0; a < tc->data_len; a++, td++) { | ||||
| Sequence *seq = ((TransDataSeq *)td->extra)->seq; | Sequence *seq = ((TransDataSeq *)td->extra)->seq; | ||||
| SEQ_collection_append_strip(seq, collection); | SEQ_collection_append_strip(seq, collection); | ||||
| ▲ Show 20 Lines • Show All 276 Lines • Show Last 20 Lines | |||||