mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed mix with bool, ticket #107

Browse Source
This commit is contained in:
Christophe Riccio 2011-06-15 23:55:49 +01:00
parent 74e22c481e
commit 7931278c0f
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

@ -936,7 +936,7 @@ namespace glm
{ {
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>
@ -957,7 +957,7 @@ namespace glm
++i ++i
) )
{ {
result[i] = a[i] ? x[i] : y[i]; result[i] = a[i] ? y[i] : x[i];
} }
return result; return result;
} }
@ -980,7 +980,7 @@ namespace glm
++i ++i
) )
{ {
result[i] = a[i] ? x[i] : y[i]; result[i] = a[i] ? y[i] : x[i];
} }
return result; return result;
} }
@ -1003,7 +1003,7 @@ namespace glm
++i ++i
) )
{ {
result[i] = a[i] ? x[i] : y[i]; result[i] = a[i] ? y[i] : x[i];
} }
return result; return result;
} }