diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 19:30:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 19:30:02 +0400 |
| commit | e86dbf687769a7f38ab465c89d1111a8be691ca2 (patch) | |
| tree | 709daceab4b5cbab4564b481a5579895c286629b /intern/cycles/kernel/geom/geom_object.h | |
| parent | 2a3cdeadf11d29a2321d5d19929c82f19d8ec186 (diff) | |
Code cleanup: avoid int/uint mixup in cycles
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 de800d7cf00..5b0127f8a3b 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/geom_object.h @@ -240,7 +240,7 @@ ccl_device_inline float object_random_number(KernelGlobals *kg, int object) /* Particle ID from which this object was generated */ -ccl_device_inline uint object_particle_id(KernelGlobals *kg, int object) +ccl_device_inline int object_particle_id(KernelGlobals *kg, int object) { if(object == OBJECT_NONE) return 0.0f; |