diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-03 22:29:11 +0400 |
| commit | 2996f08f845c4b67b0231d5832668da5ddb2d227 (patch) | |
| tree | 419f3dbd78a19398883a405606f7a7de83084d90 /intern/cycles/kernel/kernel_film.h | |
| parent | 170f8c8c4109afb366bac0f385d9e2f59af6c8e2 (diff) | |
Cycles: first batch of windows build fixes, not quite there yet.
Diffstat (limited to 'intern/cycles/kernel/kernel_film.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_film.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h index 04ea889f4c0..0bbd6c202a1 100644 --- a/intern/cycles/kernel/kernel_film.h +++ b/intern/cycles/kernel/kernel_film.h @@ -44,9 +44,9 @@ __device uchar4 film_float_to_byte(float4 color) uchar4 result; /* simple float to byte conversion */ - result.x = clamp(color.x*255.0f, 0.0f, 255.0f); - result.y = clamp(color.y*255.0f, 0.0f, 255.0f); - result.z = clamp(color.z*255.0f, 0.0f, 255.0f); + result.x = (uchar)clamp(color.x*255.0f, 0.0f, 255.0f); + result.y = (uchar)clamp(color.y*255.0f, 0.0f, 255.0f); + result.z = (uchar)clamp(color.z*255.0f, 0.0f, 255.0f); result.w = 255; return result; |