[Bf-blender-cvs] [b37dc6a] master: Fix T39291: "Stepped" F-curve modifier does not work as expected when stacked after other modifiers

Joshua Leung noreply at git.blender.org
Mon Mar 31 14:55:55 CEST 2014


Commit: b37dc6a8bd4137ad185a594106b66479add2c1d5
Author: Joshua Leung
Date:   Tue Apr 1 01:51:45 2014 +1300
https://developer.blender.org/rBb37dc6a8bd4137ad185a594106b66479add2c1d5

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)

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

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

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

diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 6c4162c..038b9cb 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);




More information about the Bf-blender-cvs mailing list