[Bf-blender-cvs] [91264cf] master: Revert "Fix T45191 Speed strip behaviour not easy to predict."
Campbell Barton
noreply at git.blender.org
Tue Sep 8 16:42:47 CEST 2015
Commit: 91264cfdd05722422f77599f22d28aa093af7c1e
Author: Campbell Barton
Date: Wed Sep 9 00:36:10 2015 +1000
Branches: master
https://developer.blender.org/rB91264cfdd05722422f77599f22d28aa093af7c1e
Revert "Fix T45191 Speed strip behaviour not easy to predict."
This reverts commit 0e83b0854fc66af16dd187759c031e530ecd4c05.
Fixes T46038
===================================================================
M source/blender/blenkernel/intern/seqeffects.c
===================================================================
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 3e6edbe..99de56c 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2480,7 +2480,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 = 1.0f;
+ fallback_fac = (float) seq->seq1->len / (float) (seq->seq1->enddisp - seq->seq1->start);
flags = SEQ_SPEED_INTEGRATE;
fcu = NULL;
}
More information about the Bf-blender-cvs
mailing list