From f74d85ffc8232a859b1419f5dc25b244ae04375f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 May 2018 17:31:28 +0200 Subject: Cleanup: rename char/float conversion functions - FTOCHAR -> unit_float_to_uchar_clamp - F3TOCHAR3 -> unit_float_to_uchar_clamp_v3 (swap args) - F4TOCHAR4 -> unit_float_to_uchar_clamp_v4 (swap args) - FTOUSHORT -> unit_float_to_ushort_clamp - USHORTTOUCHAR -> unit_ushort_to_uchar --- source/blender/blenkernel/intern/dynamicpaint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/dynamicpaint.c') diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 0b5cdae2507..c34bd2493eb 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -1823,7 +1823,7 @@ static void dynamic_paint_apply_surface_vpaint_cb( } /* apply wetness */ if (mloopcol_wet) { - const char c = FTOCHAR(pPoint[v_index].wetness); + const char c = unit_float_to_uchar_clamp(pPoint[v_index].wetness); mloopcol_wet[l_index].r = c; mloopcol_wet[l_index].g = c; mloopcol_wet[l_index].b = c; @@ -1853,7 +1853,7 @@ static void dynamic_paint_apply_surface_vpaint_cb( rgb_float_to_uchar((unsigned char *)&mloopcol_preview[l_index].r, c); } else { - const char c = FTOCHAR(pPoint[v_index].wetness); + const char c = unit_float_to_uchar_clamp(pPoint[v_index].wetness); mloopcol_preview[l_index].r = c; mloopcol_preview[l_index].g = c; mloopcol_preview[l_index].b = c; -- cgit v1.2.3