Browse Source

Resolved issue #24, incorrect assert messages for step and smoothstep

Christophe Riccio 13 years ago
parent
commit
82832839c2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      glm/core/func_common.inl

+ 2 - 2
glm/core/func_common.inl

@@ -615,7 +615,7 @@ namespace detail
 		genType const & x
 	)
 	{
-		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'mix' only accept floating-point inputs");
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'step' only accept floating-point inputs");
 
 		return x < edge ? genType(0) : genType(1);
 	}
@@ -707,7 +707,7 @@ namespace detail
 		genType const & x
 	)
 	{
-		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'mix' only accept floating-point inputs");
+		GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'smoothstep' only accept floating-point inputs");
 
 		genType tmp = clamp((x - edge0) / (edge1 - edge0), genType(0), genType(1));
 		return tmp * tmp * (genType(3) - genType(2) * tmp);