Merge branch '0.9.4' of https://github.com/g-truc/glm into 0.9.5

ago%!(EXTRA string=12 years) · 5de63682f2
parent bd7125c50b 4286b02686
commit 5de63682f2
2 changed files with 2 additions and 2 deletions
--- a/glm/core/func_integer.inl
+++ b/glm/core/func_integer.inl
@ -103,7 +103,7 @@ namespace glm
 		if(x > y)
 			return genUType(detail::highp_int_t(x) - detail::highp_int_t(y));
 		else
-			return genUType(detail::highp_int_t(1) << detail::highp_int_t(32) + detail::highp_int_t(x) - detail::highp_int_t(y));
+			return genUType((detail::highp_int_t(1) << detail::highp_int_t(32)) + detail::highp_int_t(x) - detail::highp_int_t(y));
 	}

 	template <typename T>
--- a/glm/gtc/matrix_transform.inl
+++ b/glm/gtc/matrix_transform.inl
@ -242,7 +242,7 @@ namespace glm
 		valType const rad = glm::radians(fovy);
 #endif
        
-		valType range = tan(radians(rad / valType(2))) * zNear;	
+		valType range = tan(rad / valType(2)) * zNear;	
 		valType left = -range * aspect;
 		valType right = range * aspect;
 		valType bottom = -range;