From 82832839c2bb8929957f80f86e8aa75e0aedf982 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 21 Dec 2012 00:17:23 +0100 Subject: [PATCH] Resolved issue #24, incorrect assert messages for step and smoothstep --- glm/core/func_common.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl index 14504d18..9c1c0470 100644 --- a/glm/core/func_common.inl +++ b/glm/core/func_common.inl @@ -615,7 +615,7 @@ namespace detail genType const & x ) { - GLM_STATIC_ASSERT(detail::type::is_float, "'mix' only accept floating-point inputs"); + GLM_STATIC_ASSERT(detail::type::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::is_float, "'mix' only accept floating-point inputs"); + GLM_STATIC_ASSERT(detail::type::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);