diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-12-15 08:11:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-12-15 08:14:59 +0300 |
commit | e035d7301c8c6fc1bb42110054101b00d190d1f9 (patch) | |
tree | b7b02c0db15249b7f2965d22b53002bfe7dbb422 /source/blender/editors/space_sequencer | |
parent | a05d98884a3b0dae46c934c92c336b0b5d210dce (diff) |
Fix crash sliding effect sequence strips
Off by one error in array access.
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 93b17830c0f..953a77d22a6 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -537,7 +537,7 @@ static int slip_add_sequences_recursive( for (seq = seqbasep->first; seq; seq = seq->next) { if (!do_trim || (!(seq->type & SEQ_TYPE_EFFECT) && (seq->flag & SELECT))) { seq_array[offset + num_items] = seq; - trim[offset + num_items] = do_trim; + trim[offset + num_items] = do_trim && ((seq->type & SEQ_TYPE_EFFECT) == 0); num_items++; if (seq->type == SEQ_TYPE_META) { @@ -545,9 +545,6 @@ static int slip_add_sequences_recursive( num_items += slip_add_sequences_recursive( &seq->seqbase, seq_array, trim, num_items + offset, false); } - else if (seq->type & SEQ_TYPE_EFFECT) { - trim[offset + num_items] = false; - } } } |