diff --git a/glm/detail/type_mat2x3.inl b/glm/detail/type_mat2x3.inl index 2452da84..126f5858 100644 --- a/glm/detail/type_mat2x3.inl +++ b/glm/detail/type_mat2x3.inl @@ -432,7 +432,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER tmat4x3 operator*(tmat2x3 const & m1, tmat3x2 const & m2) + GLM_FUNC_QUALIFIER tmat4x3 operator*(tmat2x3 const & m1, tmat4x2 const & m2) { return tmat4x3( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], diff --git a/readme.txt b/readme.txt index 18dce2cb..2e8dd254 100644 --- a/readme.txt +++ b/readme.txt @@ -75,6 +75,7 @@ Improvements: Fixes: - Fixed faceforward build #289 - Fixed decompose function VS2010 templating issues #294 +- Fixed mat4x3 = mat2x3 * mat4x2 #297 ================================================================================ GLM 0.9.6.1: 2014-12-10