From 019a8bc23ba8f748c33a1e563ec782f2ff7d672f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 14 Jun 2014 17:00:15 +1000 Subject: [PATCH] Quiet warning in Cycles --- intern/cycles/util/util_color.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h index d362c8abe25..48e9e2d025f 100644 --- a/intern/cycles/util/util_color.h +++ b/intern/cycles/util/util_color.h @@ -28,7 +28,7 @@ CCL_NAMESPACE_BEGIN ccl_device uchar float_to_byte(float val) { - return ((val <= 0.0f) ? 0 : (((val) > (1.0f - 0.5f / 255.0f)) ? 255 : ((255.0f * (val)) + 0.5f))); + return ((val <= 0.0f) ? 0 : ((val > (1.0f - 0.5f / 255.0f)) ? 255 : (uchar)((255.0f * val) + 0.5f))); } ccl_device uchar4 color_float_to_byte(float3 c)