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/svm/svm_geometry.h | |
| parent | 2a3cdeadf11d29a2321d5d19929c82f19d8ec186 (diff) | |
Code cleanup: avoid int/uint mixup in cycles
Diffstat (limited to 'intern/cycles/kernel/svm/svm_geometry.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_geometry.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/svm/svm_geometry.h b/intern/cycles/kernel/svm/svm_geometry.h index 1ed6a4b1916..0ec61fdebf0 100644 --- a/intern/cycles/kernel/svm/svm_geometry.h +++ b/intern/cycles/kernel/svm/svm_geometry.h @@ -98,44 +98,44 @@ ccl_device void svm_node_particle_info(KernelGlobals *kg, ShaderData *sd, float { switch(type) { case NODE_INFO_PAR_INDEX: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float(stack, out_offset, particle_index(kg, particle_id)); break; } case NODE_INFO_PAR_AGE: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float(stack, out_offset, particle_age(kg, particle_id)); break; } case NODE_INFO_PAR_LIFETIME: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float(stack, out_offset, particle_lifetime(kg, particle_id)); break; } case NODE_INFO_PAR_LOCATION: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float3(stack, out_offset, particle_location(kg, particle_id)); break; } #if 0 /* XXX float4 currently not supported in SVM stack */ case NODE_INFO_PAR_ROTATION: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float4(stack, out_offset, particle_rotation(kg, particle_id)); break; } #endif case NODE_INFO_PAR_SIZE: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float(stack, out_offset, particle_size(kg, particle_id)); break; } case NODE_INFO_PAR_VELOCITY: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float3(stack, out_offset, particle_velocity(kg, particle_id)); break; } case NODE_INFO_PAR_ANGULAR_VELOCITY: { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); stack_store_float3(stack, out_offset, particle_angular_velocity(kg, particle_id)); break; } |