Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/space_sequencer/sequencer_edit.c
| Context not available. | |||||
| if (seq->flag & SELECT && !(seq->depth == 0 && seq->flag & SEQ_LOCK)) { | if (seq->flag & SELECT && !(seq->depth == 0 && seq->flag & SEQ_LOCK)) { | ||||
| seq->flag &= ~SEQ_OVERLAP; | seq->flag &= ~SEQ_OVERLAP; | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, seq) ) { | if (BKE_sequence_test_overlap(ed->seqbasep, seq) ) { | ||||
| BKE_sequence_base_shuffle(ed->seqbasep, seq, scene); | BKE_sequence_base_shuffle(ed->seqbasep, seq, scene, SEQ_CHANNEL_INC); | ||||
| } | } | ||||
| } | } | ||||
| else if (seq->type & SEQ_TYPE_EFFECT) { | else if (seq->type & SEQ_TYPE_EFFECT) { | ||||
| Context not available. | |||||
| if (adjust_length) { | if (adjust_length) { | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, seq)) | if (BKE_sequence_test_overlap(ed->seqbasep, seq)) | ||||
| BKE_sequence_base_shuffle(ed->seqbasep, seq, scene); | BKE_sequence_base_shuffle(ed->seqbasep, seq, scene, SEQ_CHANNEL_INC); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| Context not available. | |||||
| for (seq = ed->seqbasep->first; seq; seq = seq->next) { | for (seq = ed->seqbasep->first; seq; seq = seq->next) { | ||||
| if ((seq->type & SEQ_TYPE_EFFECT) == 0 && (seq->flag & SELECT)) { | if ((seq->type & SEQ_TYPE_EFFECT) == 0 && (seq->flag & SELECT)) { | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, seq)) { | if (BKE_sequence_test_overlap(ed->seqbasep, seq)) { | ||||
| BKE_sequence_base_shuffle(ed->seqbasep, seq, scene); | BKE_sequence_base_shuffle(ed->seqbasep, seq, scene, SEQ_CHANNEL_INC); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| Context not available. | |||||
| if (step > 1) { | if (step > 1) { | ||||
| seq_new->flag &= ~SEQ_OVERLAP; | seq_new->flag &= ~SEQ_OVERLAP; | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, seq_new)) { | if (BKE_sequence_test_overlap(ed->seqbasep, seq_new)) { | ||||
| BKE_sequence_base_shuffle(ed->seqbasep, seq_new, scene); | BKE_sequence_base_shuffle(ed->seqbasep, seq_new, scene, SEQ_CHANNEL_INC); | ||||
| } | } | ||||
| } | } | ||||
| Context not available. | |||||
| BKE_sequencer_active_set(scene, seqm); | BKE_sequencer_active_set(scene, seqm); | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, seqm) ) BKE_sequence_base_shuffle(ed->seqbasep, seqm, scene); | if (BKE_sequence_test_overlap(ed->seqbasep, seqm) ) BKE_sequence_base_shuffle(ed->seqbasep, seqm, scene, SEQ_CHANNEL_INC); | ||||
| BKE_sequencer_update_muting(ed); | BKE_sequencer_update_muting(ed); | ||||
| Context not available. | |||||
| if (seq->flag & SELECT) { | if (seq->flag & SELECT) { | ||||
| seq->flag &= ~SEQ_OVERLAP; | seq->flag &= ~SEQ_OVERLAP; | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, seq)) { | if (BKE_sequence_test_overlap(ed->seqbasep, seq)) { | ||||
| BKE_sequence_base_shuffle(ed->seqbasep, seq, scene); | BKE_sequence_base_shuffle(ed->seqbasep, seq, scene, SEQ_CHANNEL_INC); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| Context not available. | |||||
| if ((iseq->type & SEQ_TYPE_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) { | if ((iseq->type & SEQ_TYPE_EFFECT) && (seq_is_parent(iseq, active_seq) || seq_is_parent(iseq, seq))) { | ||||
| /* this may now overlap */ | /* this may now overlap */ | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, iseq) ) { | if (BKE_sequence_test_overlap(ed->seqbasep, iseq) ) { | ||||
| BKE_sequence_base_shuffle(ed->seqbasep, iseq, scene); | BKE_sequence_base_shuffle(ed->seqbasep, iseq, scene, SEQ_CHANNEL_INC); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| Context not available. | |||||
| /* ensure pasted strips don't overlap */ | /* ensure pasted strips don't overlap */ | ||||
| for (iseq = iseq_first; iseq; iseq = iseq->next) { | for (iseq = iseq_first; iseq; iseq = iseq->next) { | ||||
| if (BKE_sequence_test_overlap(ed->seqbasep, iseq)) { | if (BKE_sequence_test_overlap(ed->seqbasep, iseq)) { | ||||
| BKE_sequence_base_shuffle(ed->seqbasep, iseq, scene); | BKE_sequence_base_shuffle(ed->seqbasep, iseq, scene, SEQ_CHANNEL_INC); | ||||
| } | } | ||||
| } | } | ||||
| Context not available. | |||||