Browse Source

Checking if either argument is nan in fmin and fmax

Aaron 8 years ago
parent
commit
d75ef41bdb
1 changed files with 4 additions and 4 deletions
  1. 4 4
      glm/gtx/extended_min_max.inl

+ 4 - 4
glm/gtx/extended_min_max.inl

@@ -146,8 +146,8 @@ namespace glm
 		{
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmin' only accept floating-point input");
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmin' only accept floating-point input");
 
 
-			if (isnan(y))
-				return x;
+			if (isnan(x))
+				return y;
 			if (isnan(y))
 			if (isnan(y))
 				return x;
 				return x;
 
 
@@ -176,8 +176,8 @@ namespace glm
 		{
 		{
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmax' only accept floating-point input");
 			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmax' only accept floating-point input");
 
 
-			if (isnan(y))
-				return x;
+			if (isnan(x))
+				return y;
 			if (isnan(y))
 			if (isnan(y))
 				return x;
 				return x;