diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2019-05-19 21:21:37 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2019-05-19 21:55:03 +0300 |
| commit | 58bea005c58956674c7f4a9a7a85ff943c140f03 (patch) | |
| tree | 050f6bc6c59a251105d33a950a9c4f7067c68e67 /source/blender/blenkernel/intern/sequencer.c | |
| parent | eee704a83f6922810589f4a79012bd21075a7339 (diff) | |
VSE: add movie strips on top of audio
- add movies to channel above free slot (no check for 2 free slots),
add sound to the free slot
- don't override channel settings if `channel` property is set
This is just a hack. Propper implementation should be done along with T59540
Reviewed By: brecht
Differential Revision: https://developer.blender.org/T59540
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 99536b979b6..c7dd5db27e1 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -5668,12 +5668,12 @@ 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->channel--; seq_load->seq_sound = BKE_sequencer_add_sound_strip(C, seqbasep, seq_load); seq_load->start_frame = start_frame_back; - seq_load->channel--; + seq_load->channel++; } /* can be NULL */ |