diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-31 17:51:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-31 17:52:14 +0300 |
| commit | 79918e05773132ce1f96c90b555348229ddfcf73 (patch) | |
| tree | 5fab26281336976510832f36f30aeb9a6a73c3ed /intern/cycles/kernel/geom/geom_object.h | |
| parent | 7da4c2637d35c8f0f05de43a2bfbea7958dc6e44 (diff) | |
Cycles: Avoid float/int conversion in few places
Diffstat (limited to 'intern/cycles/kernel/geom/geom_object.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h index 79a56683454..7df71010232 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/geom_object.h @@ -243,7 +243,7 @@ ccl_device_inline float object_random_number(KernelGlobals *kg, int object) ccl_device_inline int object_particle_id(KernelGlobals *kg, int object) { if(object == OBJECT_NONE) - return 0.0f; + return 0; int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES; float4 f = kernel_tex_fetch(__objects, offset); |