Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-09-08 17:36:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-09-08 17:36:15 +0300
commit91264cfdd05722422f77599f22d28aa093af7c1e (patch)
tree89b98bb75b4f9aebf46adc68abc3a376a482a76e /source/blender/blenkernel/intern/seqeffects.c
parentd5f1f66f06152e7bb881bbb6387e3dc01fce4326 (diff)
Revert "Fix T45191 Speed strip behaviour not easy to predict."
This reverts commit 0e83b0854fc66af16dd187759c031e530ecd4c05. Fixes T46038
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
-rw-r--r--source/blender/blenkernel/intern/seqeffects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 3e6edbe01e8..99de56cf8c2 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;
}