[Bf-blender-cvs] [4402f43b711] blender-v2.92-release: Fix T85426: Speed effect stretch to input not working

Richard Antalik noreply at git.blender.org
Mon Feb 8 11:35:25 CET 2021


Commit: 4402f43b7119c8ee1e76fdb261454e04e4bb9520
Author: Richard Antalik
Date:   Mon Feb 8 11:30:26 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB4402f43b7119c8ee1e76fdb261454e04e4bb9520

Fix T85426: Speed effect stretch to input not working

`seq_effect_speed_get_strip_content_length()` checked only for number
of inputs of target strip, even if it's not an effect.

Only effects are treated in different way, so check for type as well.
Broken by 93c10797dc35e17bbd96f3711a151acf2d184848

Reviewed By: sergey

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

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

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

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

diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c
index 65c768076c5..fc8a5c62744 100644
--- a/source/blender/sequencer/intern/effects.c
+++ b/source/blender/sequencer/intern/effects.c
@@ -3157,7 +3157,7 @@ static void store_icu_yrange_speed(Sequence *seq, short UNUSED(adrcode), float *
  */
 static int seq_effect_speed_get_strip_content_length(const Sequence *seq)
 {
-  if (SEQ_effect_get_num_inputs(seq->type) == 0) {
+  if ((seq->type & SEQ_TYPE_EFFECT) != 0 && SEQ_effect_get_num_inputs(seq->type) == 0) {
     return seq->enddisp - seq->startdisp;
   }



More information about the Bf-blender-cvs mailing list