Fixed merge

2013-09-19 21:46:51 +02:00
parent 61589b8a28 843cc7bd61
commit b6f5b4121d
2 changed files with 3 additions and 3 deletions
--- a/glm/gtx/euler_angles.inl
+++ b/glm/gtx/euler_angles.inl
@@ -35,9 +35,9 @@ namespace glm
 		T sinY = glm::sin(angleY);

 		return detail::tmat4x4<T, defaultp>(
-			cosY,	T(0),	sinY,	T(0),
+			cosY,	T(0),	-sinY,	T(0),
 			T(0),	T(1),	T(0),	T(0),
-			-sinY,	T(0),	cosY,	T(0),
+			sinY,	T(0),	cosY,	T(0),
 			T(0),	T(0),	T(0),	T(1));
 	}