diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-28 23:31:50 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-28 23:40:46 +0400 |
commit | 89b3dcaf822bf750b87f5e48c8498dd2d6e1515b (patch) | |
tree | 5bf111735f194888198620bc266d1fd278f67d34 /source/blender/blenkernel/intern/fcurve.c | |
parent | e158fbf9349379e137a5cdb840c36dba170372d1 (diff) |
f-curve easing: Adjustments to Robert Penner elastic easing
Compensate for the clamped amplitude by blending the elastic effect.
Allows for a subtle elastic effect which wasn't possible before.
Diffstat (limited to 'source/blender/blenkernel/intern/fcurve.c')
-rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 281b4f589e1..65b9d2159df 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -2083,7 +2083,7 @@ static float fcurve_eval_keyframes(FCurve *fcu, BezTriple *bezts, float evaltime const float change = bezt->vec[1][1] - prevbezt->vec[1][1]; const float duration = bezt->vec[1][0] - prevbezt->vec[1][0]; const float time = evaltime - prevbezt->vec[1][0]; - const float amplitude = prevbezt->amplitude + fabsf(change); /* see T39405 */ + const float amplitude = prevbezt->amplitude; const float period = prevbezt->period; /* value depends on interpolation mode */ |