From 72505da8629c99c34e5225840d796036440880ee Mon Sep 17 00:00:00 2001
From: Evan Wilson <EAW>
Date: Fri, 4 Nov 2022 19:15:52 +1100
Subject: Fix T102216: Change `min_ff` to `max_ff` in the return of `BlendType
 max`

BlendType max incorrectly returns the minimum in BLI_color_mix.hh
This differential fixes it to return the maximum.

Maniphest Tasks: T102216

Ref D16364
---
 source/blender/blenlib/BLI_color_mix.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source/blender/blenlib/BLI_color_mix.hh')

diff --git a/source/blender/blenlib/BLI_color_mix.hh b/source/blender/blenlib/BLI_color_mix.hh
index 322da2bf112..55989669f70 100644
--- a/source/blender/blenlib/BLI_color_mix.hh
+++ b/source/blender/blenlib/BLI_color_mix.hh
@@ -76,7 +76,7 @@ struct FloatTraits {
 
   static inline BlendType max(BlendType a, BlendType b)
   {
-    return min_ff(a, b);
+    return max_ff(a, b);
   }
 
   /* Discretizes in steps of 1.0 / range */
-- 
cgit v1.2.3