[Bf-blender-cvs] [90ccb71969f] master: Fix missing argument, avoid instancing function call in macro

Campbell Barton noreply at git.blender.org
Thu Jun 30 15:44:36 CEST 2022


Commit: 90ccb71969f3c1358dae6e9aab2992ded78272f6
Author: Campbell Barton
Date:   Thu Jun 30 23:44:13 2022 +1000
Branches: master
https://developer.blender.org/rB90ccb71969f3c1358dae6e9aab2992ded78272f6

Fix missing argument, avoid instancing function call in macro

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

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

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

diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index 4aec4916f7b..2ab8b170ce9 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -2623,7 +2623,8 @@ 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_time_left_handle_frame_get(scene, seq) + frame_index);
-    CLAMP(target_frame, 0, SEQ_time_strip_length_get(seq->seq1));
+    const int target_frame_max = SEQ_time_strip_length_get(scene, seq->seq1);
+    CLAMP(target_frame, 0, target_frame_max);
     v->frameMap[frame_index] = target_frame;
   }
 }



More information about the Bf-blender-cvs mailing list