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/osl/osl_services.cpp | |
| parent | 2a3cdeadf11d29a2321d5d19929c82f19d8ec186 (diff) | |
Code cleanup: avoid int/uint mixup in cycles
Diffstat (limited to 'intern/cycles/kernel/osl/osl_services.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 8f437755bb9..9861e527afd 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -595,44 +595,44 @@ bool OSLRenderServices::get_object_standard_attribute(KernelGlobals *kg, ShaderD /* Particle Attributes */ else if (name == u_particle_index) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float f = particle_index(kg, particle_id); return set_attribute_float(f, type, derivatives, val); } else if (name == u_particle_age) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float f = particle_age(kg, particle_id); return set_attribute_float(f, type, derivatives, val); } else if (name == u_particle_lifetime) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float f= particle_lifetime(kg, particle_id); return set_attribute_float(f, type, derivatives, val); } else if (name == u_particle_location) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float3 f = particle_location(kg, particle_id); return set_attribute_float3(f, type, derivatives, val); } #if 0 /* unsupported */ else if (name == u_particle_rotation) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float4 f = particle_rotation(kg, particle_id); return set_attribute_float4(f, type, derivatives, val); } #endif else if (name == u_particle_size) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float f = particle_size(kg, particle_id); return set_attribute_float(f, type, derivatives, val); } else if (name == u_particle_velocity) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float3 f = particle_velocity(kg, particle_id); return set_attribute_float3(f, type, derivatives, val); } else if (name == u_particle_angular_velocity) { - uint particle_id = object_particle_id(kg, sd->object); + int particle_id = object_particle_id(kg, sd->object); float3 f = particle_angular_velocity(kg, particle_id); return set_attribute_float3(f, type, derivatives, val); } @@ -742,7 +742,8 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri ShaderData *sd = (ShaderData *)renderstate; KernelGlobals *kg = sd->osl_globals; bool is_curve; - int object, prim; + int object; + // int prim; /* lookup of attribute on another object */ if (object_name != u_empty) { @@ -752,12 +753,12 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri return false; object = it->second; - prim = PRIM_NONE; + // prim = PRIM_NONE; is_curve = false; } else { object = sd->object; - prim = sd->prim; + // prim = sd->prim; is_curve = (sd->type & PRIMITIVE_ALL_CURVE) != 0; if (object == OBJECT_NONE) |