diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-08-02 22:00:09 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-08-02 22:00:09 +0300 |
commit | d1063575b536ed9490c5002007b45704e7755385 (patch) | |
tree | 5f8de111b7222204e69d68dc3268fdad0c3fa1c9 | |
parent | 4f27e94146fdde945f5b09c9e4efe38ca760635f (diff) | |
parent | 0264f53e30c7f5c721766d5f832c12deca14e7ff (diff) |
Merge branch 'blender-v2.90-release'
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index fbd6d970e5f..b0a8f709399 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -5592,6 +5592,9 @@ Sequence *BKE_sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoad } } + if (seq_load->flag & SEQ_LOAD_MOVIE_SOUND) { + seq_load->channel++; + } seq = BKE_sequence_alloc(seqbasep, seq_load->start_frame, seq_load->channel, SEQ_TYPE_MOVIE); /* multiview settings */ @@ -5648,11 +5651,8 @@ Sequence *BKE_sequencer_add_movie_strip(bContext *C, ListBase *seqbasep, SeqLoad if (seq_load->flag & SEQ_LOAD_MOVIE_SOUND) { int start_frame_back = seq_load->start_frame; seq_load->channel--; - seq_load->seq_sound = BKE_sequencer_add_sound_strip(C, seqbasep, seq_load); - seq_load->start_frame = start_frame_back; - seq_load->channel++; } /* can be NULL */ diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 6202a3556a4..a35feb62c9d 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -151,7 +151,7 @@ static int sequencer_generic_invoke_xy_guess_channel(bContext *C, int type) int proximity = INT_MAX; if (!ed || !ed->seqbasep) { - return 2; + return 1; } for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -165,7 +165,7 @@ static int sequencer_generic_invoke_xy_guess_channel(bContext *C, int type) if (tgt) { return tgt->machine + 1; } - return 2; + return 1; } static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, int flag, int type) @@ -581,10 +581,10 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad seq = seq_load_fn(C, ed->seqbasep, &seq_load); if (seq) { - sequencer_add_apply_overlap(C, op, seq); if (seq_load.seq_sound) { sequencer_add_apply_overlap(C, op, seq_load.seq_sound); } + sequencer_add_apply_overlap(C, op, seq); } } RNA_END; @@ -594,10 +594,10 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad seq = seq_load_fn(C, ed->seqbasep, &seq_load); if (seq) { - sequencer_add_apply_overlap(C, op, seq); if (seq_load.seq_sound) { sequencer_add_apply_overlap(C, op, seq_load.seq_sound); } + sequencer_add_apply_overlap(C, op, seq); } } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 4dcf5822bb2..5c60ece747a 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1000,6 +1000,7 @@ static bool sequence_offset_after_frame(Scene *scene, const int delta, const int if (seq->startdisp >= cfra) { BKE_sequence_translate(scene, seq, delta); BKE_sequence_calc(scene, seq); + BKE_sequence_invalidate_cache_preprocessed(scene, seq); done = true; } } |