[Bf-blender-cvs] [1b63a5d] master: Fix for f-curve elastic ease in/out discontinuity

Campbell Barton noreply at git.blender.org
Mon Apr 28 18:56:12 CEST 2014


Commit: 1b63a5d815ed96ecc0d36d4b9f9a55b61ea06c63
Author: Campbell Barton
Date:   Tue Apr 29 02:50:06 2014 +1000
https://developer.blender.org/rB1b63a5d815ed96ecc0d36d4b9f9a55b61ea06c63

Fix for f-curve elastic ease in/out discontinuity

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

M	source/blender/blenlib/intern/easing.c

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

diff --git a/source/blender/blenlib/intern/easing.c b/source/blender/blenlib/intern/easing.c
index 2c7bb0a..c767c62 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)




More information about the Bf-blender-cvs mailing list