Browse Source

Fixed mat4x3 = mat2x3 * mat4x2 operator #297

Christophe Riccio 11 years ago
parent
commit
54dbea6258
2 changed files with 2 additions and 1 deletions
  1. 1 1
      glm/detail/type_mat2x3.inl
  2. 1 0
      readme.txt

+ 1 - 1
glm/detail/type_mat2x3.inl

@@ -432,7 +432,7 @@ namespace glm
 	}
 
 	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat3x2<T, P> const & m2)
+	GLM_FUNC_QUALIFIER tmat4x3<T, P> operator*(tmat2x3<T, P> const & m1, tmat4x2<T, P> const & m2)
 	{
 		return tmat4x3<T, P>(
 			m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1],

+ 1 - 0
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