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 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 4f27e94146fdde945f5b09c9e4efe38ca760635f (diff) | |
| parent | 0264f53e30c7f5c721766d5f832c12deca14e7ff (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 6 |
1 files changed, 3 insertions, 3 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 */ |