Cleanup: Use clamp_f instead of CLAMP in sculpt code

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D8528

1 files changed, 11 insertions, 18 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.c b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
index 8648b786008..576536cac03 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
@@ -127,7 +127,7 @@ static void color_filter_task_cb(void *__restrict userdata,
         float fill_color_rgba[4];
         copy_v3_v3(fill_color_rgba, data->filter_fill_color);
         fill_color_rgba[3] = 1.0f;
-        CLAMP(fade, 0.0f, 1.0f);
+        fade = clamp_f(fade, 0.0f, 1.0f);
         mul_v4_fl(fill_color_rgba, fade);
         blend_color_mix_float(final_color, orig_data.col, fill_color_rgba);
         break;
@@ -140,33 +140,28 @@ static void color_filter_task_cb(void *__restrict userdata,
         break;
       case COLOR_FILTER_SATURATION:
         rgb_to_hsv_v(orig_color, hsv_color);
-        hsv_color[1] = hsv_color[1] + fade;
-        CLAMP(hsv_color[1], 0.0f, 1.0f);
+        hsv_color[1] = clamp_f(hsv_color[1] + fade, 0.0f, 1.0f);
         hsv_to_rgb_v(hsv_color, final_color);
         break;
       case COLOR_FILTER_VALUE:
         rgb_to_hsv_v(orig_color, hsv_color);
-        hsv_color[2] = hsv_color[2] + fade;
-        CLAMP(hsv_color[2], 0.0f, 1.0f);
+        hsv_color[2] = clamp_f(hsv_color[2] + fade, 0.0f, 1.0f);
         hsv_to_rgb_v(hsv_color, final_color);
         break;
       case COLOR_FILTER_RED:
-        orig_color[0] = orig_color[0] + fade;
-        CLAMP(orig_color[0], 0.0f, 1.0f);
+        orig_color[0] = clamp_f(orig_color[0] + fade, 0.0f, 1.0f);
         copy_v3_v3(final_color, orig_color);
         break;
       case COLOR_FILTER_GREEN:
-        orig_color[1] = orig_color[1] + fade;
-        CLAMP(orig_color[1], 0.0f, 1.0f);
+        orig_color[1] = clamp_f(orig_color[1] + fade, 0.0f, 1.0f);
         copy_v3_v3(final_color, orig_color);
         break;
       case COLOR_FILTER_BLUE:
-        orig_color[2] = orig_color[2] + fade;
-        CLAMP(orig_color[2], 0.0f, 1.0f);
+        orig_color[2] = clamp_f(orig_color[2] + fade, 0.0f, 1.0f);
         copy_v3_v3(final_color, orig_color);
         break;
       case COLOR_FILTER_BRIGHTNESS:
-        CLAMP(fade, -1.0f, 1.0f);
+        fade = clamp_f(fade, -1.0f, 1.0f);
         brightness = fade;
         contrast = 0;
         delta = contrast / 2.0f;
@@ -174,12 +169,11 @@ static void color_filter_task_cb(void *__restrict userdata,
         delta *= -1;
         offset = gain * (brightness + delta);
         for (int i = 0; i < 3; i++) {
-          final_color[i] = gain * orig_color[i] + offset;
-          CLAMP(final_color[i], 0.0f, 1.0f);
+          final_color[i] = clamp_f(gain * orig_color[i] + offset, 0.0f, 1.0f);
         }
         break;
       case COLOR_FILTER_CONTRAST:
-        CLAMP(fade, -1.0f, 1.0f);
+        fade = clamp_f(fade, -1.0f, 1.0f);
         brightness = 0;
         contrast = fade;
         delta = contrast / 2.0f;
@@ -193,12 +187,11 @@ static void color_filter_task_cb(void *__restrict userdata,
           offset = gain * (brightness + delta);
         }
         for (int i = 0; i < 3; i++) {
-          final_color[i] = gain * orig_color[i] + offset;
-          CLAMP(final_color[i], 0.0f, 1.0f);
+          final_color[i] = clamp_f(gain * orig_color[i] + offset, 0.0f, 1.0f);
         }
         break;
       case COLOR_FILTER_SMOOTH: {
-        CLAMP(fade, -1.0f, 1.0f);
+        fade = clamp_f(fade, -1.0f, 1.0f);
         float smooth_color[4];
         SCULPT_neighbor_color_average(ss, smooth_color, vd.index);
         blend_color_interpolate_float(final_color, vd.col, smooth_color, fade);