[Bf-blender-cvs] [e035d7301c8] master: Fix crash sliding effect sequence strips

Campbell Barton noreply at git.blender.org
Tue Dec 15 06:15:39 CET 2020


Commit: e035d7301c8c6fc1bb42110054101b00d190d1f9
Author: Campbell Barton
Date:   Tue Dec 15 16:11:41 2020 +1100
Branches: master
https://developer.blender.org/rBe035d7301c8c6fc1bb42110054101b00d190d1f9

Fix crash sliding effect sequence strips

Off by one error in array access.

===================================================================

M	source/blender/editors/space_sequencer/sequencer_edit.c

===================================================================

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;
-      }
     }
   }



More information about the Bf-blender-cvs mailing list