From d75ef41bdb46b58f4f51bc6dc36adb054706c513 Mon Sep 17 00:00:00 2001 From: Aaron Date: Mon, 21 Aug 2017 11:16:46 -0700 Subject: [PATCH] Checking if either argument is nan in fmin and fmax --- glm/gtx/extended_min_max.inl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glm/gtx/extended_min_max.inl b/glm/gtx/extended_min_max.inl index 8fc52660..e308c6fe 100644 --- a/glm/gtx/extended_min_max.inl +++ b/glm/gtx/extended_min_max.inl @@ -146,8 +146,8 @@ namespace glm { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmin' only accept floating-point input"); - if (isnan(y)) - return x; + if (isnan(x)) + return y; if (isnan(y)) return x; @@ -176,8 +176,8 @@ namespace glm { GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmax' only accept floating-point input"); - if (isnan(y)) - return x; + if (isnan(x)) + return y; if (isnan(y)) return x;