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:
authorJoshua Leung <aligorith@gmail.com>2014-03-31 16:51:45 +0400
committerJoshua Leung <aligorith@gmail.com>2014-03-31 16:54:40 +0400
commitb37dc6a8bd4137ad185a594106b66479add2c1d5 (patch)
tree496b38876b0f40e30933b41c7a613beef32fa2fa /source/blender/blenkernel/intern/fcurve.c
parent49ca3fdf16d9748535e4cb9daa91f1e8a4e54040 (diff)
Fix T39291: "Stepped" F-curve modifier does not work as expected when stacked after other modifiers
Evaluation of time-warping modifiers ("Stepped" is one of them) didn't actually end up distorting the time to look up what values other modifiers in the stack generate. This meant that when a "stepped" fmodifier was on top of a "generator", the stepped fmodifier looked like it didn't have any effect. (This fix requires a bit of testing still, so should be left for 2.71)
Diffstat (limited to 'source/blender/blenkernel/intern/fcurve.c')
-rw-r--r--source/blender/blenkernel/intern/fcurve.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 6c4162c7b4b..038b9cbafca 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -2384,7 +2384,7 @@ float evaluate_fcurve(FCurve *fcu, float evaltime)
cvalue = fcurve_eval_samples(fcu, fcu->fpt, devaltime);
/* evaluate modifiers */
- evaluate_value_fmodifiers(storage, &fcu->modifiers, fcu, &cvalue, evaltime);
+ evaluate_value_fmodifiers(storage, &fcu->modifiers, fcu, &cvalue, devaltime);
evaluate_fmodifiers_storage_free(storage);