Browse Source

Merge branch '0.9.2' into 0.9.3

Christophe Riccio 14 years ago
parent
commit
e03c9687d8
2 changed files with 3 additions and 2 deletions
  1. 2 2
      glm/core/func_matrix.inl
  2. 1 0
      readme.txt

+ 2 - 2
glm/core/func_matrix.inl

@@ -74,7 +74,7 @@ namespace glm
 		GLM_STATIC_ASSERT(detail::type<T>::is_float, "'outerProduct' only accept floating-point inputs");
 
 		detail::tmat3x3<T> m(detail::tmat3x3<T>::null);
-		for(typename detail::tmat3x3<T>::size_type i = 0; i < detail::tmat3x3<T>::col_size(); ++i)
+		for(typename detail::tmat3x3<T>::size_type i(0); i < m.length(); ++i)
 			m[i] = c * r[i];
 		return m;
 	}
@@ -89,7 +89,7 @@ namespace glm
 		GLM_STATIC_ASSERT(detail::type<T>::is_float, "'outerProduct' only accept floating-point inputs");
 
 		detail::tmat4x4<T> m(detail::tmat4x4<T>::null);
-		for(typename detail::tmat4x4<T>::size_type i = 0; i < detail::tmat4x4<T>::col_size(); ++i)
+		for(typename detail::tmat4x4<T>::size_type i(0); i < m.length(); ++i)
 			m[i] = c * r[i];
 		return m;
 	}

+ 1 - 0
readme.txt

@@ -48,6 +48,7 @@ GLM 0.9.2.8: 2011-12-XX
 --------------------------------------------------------------------------------
 - Fixed modf implementation
 - Fixed step function accuracy
+- Fixed outerProduct
 
 ================================================================================
 GLM 0.9.3.A: 2011-11-11