mewin/glm
1
0
Fork 0
Code Releases Activity

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
parent c0e426c48a 7931278c0f
commit 642edcc53a
1 changed files with 4 additions and 4 deletions
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"); 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> template <typename T>
@@ -969,7 +969,7 @@ namespace detail
++i ++i
) )
{ {
result[i] = a[i] ? x[i] : y[i]; result[i] = a[i] ? y[i] : x[i];
} }
return result; return result;
} }
@@ -992,7 +992,7 @@ namespace detail
++i ++i
) )
{ {
result[i] = a[i] ? x[i] : y[i]; result[i] = a[i] ? y[i] : x[i];
} }
return result; return result;
} }
@@ -1015,7 +1015,7 @@ namespace detail
++i ++i
) )
{ {
result[i] = a[i] ? x[i] : y[i]; result[i] = a[i] ? y[i] : x[i];
} }
return result; return result;
} }