[Bf-blender-cvs] [72505da8629] blender-v3.4-release: Fix T102216: Change `min_ff` to `max_ff` in the return of `BlendType max`

Evan Wilson noreply at git.blender.org
Fri Nov 4 09:19:06 CET 2022


Commit: 72505da8629c99c34e5225840d796036440880ee
Author: Evan Wilson
Date:   Fri Nov 4 19:15:52 2022 +1100
Branches: blender-v3.4-release
https://developer.blender.org/rB72505da8629c99c34e5225840d796036440880ee

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

===================================================================

M	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 */



More information about the Bf-blender-cvs mailing list