Fixed merge

2013-05-16 14:36:51 +00:00
parent 8ec6166072 b95a53095b
commit 056e053b3f
2 changed files with 2 additions and 0 deletions
--- a/glm/core/func_exponential.inl
+++ b/glm/core/func_exponential.inl
@@ -146,6 +146,7 @@ namespace _detail
 	)
 	{
 		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'inversesqrt' only accept floating-point input");
+		assert(x > genType(0));

 		return genType(1) / ::std::sqrt(x);
 	}