diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-14 11:00:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-14 11:00:15 +0400 |
| commit | 019a8bc23ba8f748c33a1e563ec782f2ff7d672f (patch) | |
| tree | 0ba04243bf54fc0e2fdbd07bb182a6be82f56be8 /intern | |
| parent | 29e8c46e305de3cb57aa735360371cfb29f8f545 (diff) | |
Quiet warning in Cycles
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_color.h | 2 |
1 files changed, 1 insertions, 1 deletions
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) |