Fixed merge

This commit is contained in:
Christophe Riccio 2011-01-31 17:25:16 +00:00
commit cb05c4c00f

View File

@ -189,7 +189,7 @@ namespace glm
inline genType trunc(genType const & x) inline genType trunc(genType const & x)
{ {
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'trunc' only accept floating-point inputs"); GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'trunc' only accept floating-point inputs");
return floor(abs(x)); return x < 0 ? -floor(-x) : floor(x);;
} }
template <typename valType> template <typename valType>