[Bf-blender-cvs] [0e83b08] master: Fix T45191 Speed strip behaviour not easy to predict.

Antony Riakiotakis noreply at git.blender.org
Thu Jun 25 19:52:06 CEST 2015


Commit: 0e83b0854fc66af16dd187759c031e530ecd4c05
Author: Antony Riakiotakis
Date:   Thu Jun 25 19:49:08 2015 +0200
Branches: master
https://developer.blender.org/rB0e83b0854fc66af16dd187759c031e530ecd4c05

Fix T45191 Speed strip behaviour not easy to predict.

Code here calculated speed based on underlying strip start position,
which was not really visible, making prediction of the result really
difficult. Things here are simple: As long as the strip exists,
manipulate the current frame by the provided factor.

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

M	source/blender/blenkernel/intern/seqeffects.c

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

diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index a8787d4..f8608ce 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2477,7 +2477,7 @@ void BKE_sequence_effect_speed_rebuild_map(Scene *scene, Sequence *seq, bool for
 		if ((seq->seq1->enddisp != seq->seq1->start) &&
 		    (seq->seq1->len != 0))
 		{
-			fallback_fac = (float) seq->seq1->len / (float) (seq->seq1->enddisp - seq->seq1->start);
+			fallback_fac = 1.0f;
 			flags = SEQ_SPEED_INTEGRATE;
 			fcu = NULL;
 		}




More information about the Bf-blender-cvs mailing list