diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-28 20:50:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-28 20:55:59 +0400 |
| commit | 1b63a5d815ed96ecc0d36d4b9f9a55b61ea06c63 (patch) | |
| tree | d1d43371d3f92868da49739482f896e5e87d001e /source/blender/blenlib/intern/easing.c | |
| parent | 49a5c579572410f827a55f2df568cecb24acf76f (diff) | |
Fix for f-curve elastic ease in/out discontinuity
Diffstat (limited to 'source/blender/blenlib/intern/easing.c')
| -rw-r--r-- | source/blender/blenlib/intern/easing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/easing.c b/source/blender/blenlib/intern/easing.c index 2c7bb0a3abe..c767c62490f 100644 --- a/source/blender/blenlib/intern/easing.c +++ b/source/blender/blenlib/intern/easing.c @@ -207,7 +207,7 @@ float BLI_easing_elastic_ease_in_out(float time, float begin, float change, floa } time -= 1.0f; - return amplitude * powf(2, -10 * time) * sinf((time * duration - s) * (2 * (float)M_PI) / period) * 0.5f + change + begin; + return amplitude * powf(2, -10 * time) * sinf((-time * duration - s) * (2 * (float)M_PI) / period) * 0.5f + change + begin; } float BLI_easing_expo_ease_in(float time, float begin, float change, float duration) |