Merge branch 'blender-v3.4-release'

2022-11-04 19:19:23 +11:00
parent d4f0ccb6b4 72505da862
commit 4b2458b457
1 changed files with 1 additions and 1 deletions
--- 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 */