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_object.h | |
| parent | c24be7ec6e5269c54552d1fb03707b97befd48d1 (diff) | |
Code cleanup: avoid some warnings due to implicit uint/int/float/double conversion.
Diffstat (limited to 'intern/cycles/kernel/kernel_object.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_object.h b/intern/cycles/kernel/kernel_object.h index 40aa4753daa..bb5ed50c995 100644 --- a/intern/cycles/kernel/kernel_object.h +++ b/intern/cycles/kernel/kernel_object.h @@ -201,7 +201,7 @@ __device_inline uint object_particle_id(KernelGlobals *kg, int object) int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES; float4 f = kernel_tex_fetch(__objects, offset); - return __float_as_int(f.w); + return __float_as_uint(f.w); } __device_inline float3 object_dupli_generated(KernelGlobals *kg, int object) |