organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-10 07:18:54 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge branch '0.9.2' into 0.9.3

Browse source
This commit is contained in:
Christophe Riccio 2011-06-15 23:56:06 +01:00
commit 642edcc53a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
glm/core/func_common.inl
View file

@ -948,7 +948,7 @@ namespace detail
{
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'mix' only accept floating-point inputs");
return a ? x : y;
return a ? y : x;
}
template <typename T>
@ -969,7 +969,7 @@ namespace detail
++i
)
{
result[i] = a[i] ? x[i] : y[i];
result[i] = a[i] ? y[i] : x[i];
}
return result;
}
@ -992,7 +992,7 @@ namespace detail
++i
)
{
result[i] = a[i] ? x[i] : y[i];
result[i] = a[i] ? y[i] : x[i];
}
return result;
}
@ -1015,7 +1015,7 @@ namespace detail
++i
)
{
result[i] = a[i] ? x[i] : y[i];
result[i] = a[i] ? y[i] : x[i];
}
return result;
}