diff options
author | Richard Antalik <richardantalik@gmail.com> | 2021-11-18 03:40:37 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2021-11-18 03:40:37 +0300 |
commit | ceec400975836efde37d2a02c66d261587139fd8 (patch) | |
tree | 064cd99e24f722a91c7c7d63d46eb0b4281b231e /source/blender | |
parent | d6b5251572f15b06d1215d1fd8d3d34f2741902e (diff) | |
parent | d8fd575af9cdb66dcc3e50cc3b1b5c41ad049b4f (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index e58e52b5e94..616953e720a 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -678,8 +678,11 @@ static void sequencer_add_movie_multiple_strips(bContext *C, load_data->start_frame += audio_frame_offset; seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, audio_skip); - int min_startdisp = MIN2(seq_movie->startdisp, seq_sound->startdisp); - int max_enddisp = MAX2(seq_movie->enddisp, seq_sound->enddisp); + int min_startdisp = 0, max_enddisp = 0; + if (seq_sound != NULL) { + min_startdisp = MIN2(seq_movie->startdisp, seq_sound->startdisp); + max_enddisp = MAX2(seq_movie->enddisp, seq_sound->enddisp); + } load_data->start_frame += max_enddisp - min_startdisp - audio_frame_offset; } |