diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-07 20:06:17 +0400 |
| commit | d835d2f4e65ae3bf8e22f8d3d60e7e6ea7a6b4ca (patch) | |
| tree | 77475cb0eec4dda28415b6c9f6be51df28acf286 /intern/cycles/kernel/kernel_compat_cpu.h | |
| parent | c24be7ec6e5269c54552d1fb03707b97befd48d1 (diff) | |
Code cleanup: avoid some warnings due to implicit uint/int/float/double conversion.
Diffstat (limited to 'intern/cycles/kernel/kernel_compat_cpu.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h index 9972a63bfbb..a32b33a727a 100644 --- a/intern/cycles/kernel/kernel_compat_cpu.h +++ b/intern/cycles/kernel/kernel_compat_cpu.h @@ -88,7 +88,7 @@ template<typename T> struct texture_image { float frac(float x, int *ix) { - int i = (int)x - ((x < 0.0f)? 1: 0); + int i = float_to_int(x) - ((x < 0.0f)? 1: 0); *ix = i; return x - (float)i; } |