Merge branch '0.9.2' into noise

ago%!(EXTRA string=14 years) · 477382f798
parent 3bf665116d 27b06c9e42
commit 477382f798
1 changed files with 2 additions and 2 deletions
--- a/glm/gtc/type_ptr.hpp
+++ b/glm/gtc/type_ptr.hpp
@ -426,7 +426,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat3<T> make_mat3(T const * const ptr)
+		inline detail::tmat3x3<T> make_mat3(T const * const ptr)
 		{
 			return make_mat3x3(Result);
 		}
@ -434,7 +434,7 @@ namespace glm
 		//! Build a matrix from a pointer.
 		//! From GLM_GTC_type_ptr extension.
 		template<typename T>
-		inline detail::tmat4<T> make_mat4(T const * const ptr)
+		inline detail::tmat4x4<T> make_mat4(T const * const ptr)
 		{
 			return make_mat4x4(Result);
 		}