Fixed mix with bool, ticket #107

ago%!(EXTRA string=14 years) · 7931278c0f
parent 74e22c481e
commit 7931278c0f
1 changed files with 4 additions and 4 deletions
--- a/glm/core/func_common.inl
+++ b/glm/core/func_common.inl
@ -936,7 +936,7 @@ namespace glm
 	{
 		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>
@ -957,7 +957,7 @@ namespace glm
 			++i
 		)
 		{
-			result[i] = a[i] ? x[i] : y[i];
+			result[i] = a[i] ? y[i] : x[i];
 		}
 		return result;
 	}
@ -980,7 +980,7 @@ namespace glm
 			++i
 		)
 		{
-			result[i] = a[i] ? x[i] : y[i];
+			result[i] = a[i] ? y[i] : x[i];
 		}
 		return result;
 	}
@ -1003,7 +1003,7 @@ namespace glm
 			++i
 		)
 		{
-			result[i] = a[i] ? x[i] : y[i];
+			result[i] = a[i] ? y[i] : x[i];
 		}
 		return result;
 	}