Merge branch '0.9.2' into 0.9.3

glm/core/func_matrix.inl

@@ -135,8 +135,8 @@ namespace glm
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tmat2x4<T> outerProduct
 	(
-		detail::tvec2<T> const & c, 
+		detail::tvec4<T> const & c, 
-		detail::tvec4<T> const & r
+		detail::tvec2<T> const & r
 	)
 	{
 		GLM_STATIC_ASSERT(detail::type<T>::is_float, "'outerProduct' only accept floating-point inputs");
@@ -156,8 +156,8 @@ namespace glm
 	template <typename T>
 	GLM_FUNC_QUALIFIER detail::tmat4x2<T> outerProduct
 	(
-		detail::tvec4<T> const & c, 
+		detail::tvec2<T> const & c, 
-		detail::tvec2<T> const & r
+		detail::tvec4<T> const & r
 	)
 	{
 		GLM_STATIC_ASSERT(detail::type<T>::is_float, "'outerProduct' only accept floating-point inputs");

glm/core/type_mat2x2.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat2x3.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat2x4.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat3x2.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat3x3.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat3x4.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat4x2.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat4x3.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_mat4x4.inl

@@ -57,7 +57,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 
@@ -68,7 +68,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < this->row_size());
+		assert(i < this->length());
 		return this->value[i];
 	}
 

glm/core/type_vec1.inl

@@ -50,7 +50,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -60,7 +60,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 

glm/core/type_vec2.inl

@@ -51,7 +51,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -62,7 +62,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 

glm/core/type_vec3.inl

@@ -51,7 +51,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -62,7 +62,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 

glm/core/type_vec4.inl

@@ -51,7 +51,7 @@ namespace detail
 		size_type i
 	)
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}
 
@@ -62,7 +62,7 @@ namespace detail
 		size_type i
 	) const
 	{
-		assert(i < value_size());
+		assert(i < this->length());
 		return (&x)[i];
 	}