Merge pull request #210 from moushkka/0.9.5

Fixed linear interpolation when cosTheta is close to 1 in quaternion slerp #210
2014-06-12 19:27:22 +02:00
parent c506b43d49 e610e9446e
commit a1a861a4a6
2 changed files with 13 additions and 4 deletions
--- a/glm/gtc/quaternion.inl
+++ b/glm/gtc/quaternion.inl
@@ -582,10 +582,10 @@ namespace detail
 		{
 			// Linear interpolation
 			return detail::tquat<T, P>(
-				mix(x.w, y.w, a),
-				mix(x.x, y.x, a),
-				mix(x.y, y.y, a),
-				mix(x.z, y.z, a));
+				mix(x.w, z.w, a),
+				mix(x.x, z.x, a),
+				mix(x.y, z.y, a),
+				mix(x.z, z.z, a));
 		}
 		else
 		{