[Bf-blender-cvs] [0419c74ae8b] master: VSE: Clamp resulting frame in multiply mode

Peter Fog noreply at git.blender.org
Mon Sep 27 14:42:33 CEST 2021


Commit: 0419c74ae8b43cb259bd3539669eba52b4aa8fa5
Author: Peter Fog
Date:   Mon Sep 27 14:36:56 2021 +0200
Branches: master
https://developer.blender.org/rB0419c74ae8b43cb259bd3539669eba52b4aa8fa5

VSE: Clamp resulting frame in multiply mode

The clamp added will ensure immediate speed direction change on
changing to/from positive/negative speed factor when using the Speed
effect strip's Multiply mode.

Reviewed By: ISS, sergey

Differential Revision: https://developer.blender.org/D12462

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

M	source/blender/sequencer/intern/effects.c

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

diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index 4448db013fe..427a8835879 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -3154,6 +3154,7 @@ void seq_effect_speed_rebuild_map(Scene *scene, Sequence *seq)
   float target_frame = 0;
   for (int frame_index = 1; frame_index < effect_strip_length; frame_index++) {
     target_frame += evaluate_fcurve(fcu, seq->startdisp + frame_index);
+    CLAMP(target_frame, 0, seq->seq1->len);
     v->frameMap[frame_index] = target_frame;
   }
 }



More information about the Bf-blender-cvs mailing list