Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Wilson <EAW>2022-11-04 11:15:52 +0300
committerCampbell Barton <campbell@blender.org>2022-11-04 11:18:54 +0300
commit72505da8629c99c34e5225840d796036440880ee (patch)
treea2048bcdfba232b836d22784bff924d227e20144
parent11a705c2d003854ac21d81ea3261a6c9dc804a70 (diff)
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
-rw-r--r--source/blender/blenlib/BLI_color_mix.hh2
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 */