diff options
| author | Campbell Barton <campbell@blender.org> | 2022-11-04 11:19:23 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-11-04 11:19:23 +0300 |
| commit | 4b2458b4572a83c6426c8b528f4bd315ea38ab84 (patch) | |
| tree | 317d2306a52314f5552bb07a1590d9193e00a395 | |
| parent | d4f0ccb6b484b6c5e4ba7db0f530f0169fab58bc (diff) | |
| parent | 72505da8629c99c34e5225840d796036440880ee (diff) | |
Merge branch 'blender-v3.4-release'
| -rw-r--r-- | source/blender/blenlib/BLI_color_mix.hh | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |