diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-03-29 16:03:47 +0400 |
| commit | e8b1cfed0a3afbf69b5bd5a7e0a51381622e844f (patch) | |
| tree | 8416fab6524a7041edf5dc95539ce1973092f9e9 /intern/cycles/kernel/geom/geom_object.h | |
| parent | 6997908afc38a3c98d09939f3b46f10d7a165d2e (diff) | |
Cycles code refactor: replace magic ~0 values in the code with defines.
Diffstat (limited to 'intern/cycles/kernel/geom/geom_object.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_object.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h index b1106c25fd7..06f7d28c052 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/geom_object.h @@ -162,7 +162,7 @@ ccl_device_inline void object_inverse_dir_transform(KernelGlobals *kg, ShaderDat ccl_device_inline float3 object_location(KernelGlobals *kg, ShaderData *sd) { - if(sd->object == ~0) + if(sd->object == OBJECT_NONE) return make_float3(0.0f, 0.0f, 0.0f); #ifdef __OBJECT_MOTION__ @@ -182,7 +182,7 @@ ccl_device_inline float object_surface_area(KernelGlobals *kg, int object) ccl_device_inline float object_pass_id(KernelGlobals *kg, int object) { - if(object == ~0) + if(object == OBJECT_NONE) return 0.0f; int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES; @@ -192,7 +192,7 @@ ccl_device_inline float object_pass_id(KernelGlobals *kg, int object) ccl_device_inline float object_random_number(KernelGlobals *kg, int object) { - if(object == ~0) + if(object == OBJECT_NONE) return 0.0f; int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES; @@ -202,7 +202,7 @@ ccl_device_inline float object_random_number(KernelGlobals *kg, int object) ccl_device_inline uint object_particle_id(KernelGlobals *kg, int object) { - if(object == ~0) + if(object == OBJECT_NONE) return 0.0f; int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES; @@ -212,7 +212,7 @@ ccl_device_inline uint object_particle_id(KernelGlobals *kg, int object) ccl_device_inline float3 object_dupli_generated(KernelGlobals *kg, int object) { - if(object == ~0) + if(object == OBJECT_NONE) return make_float3(0.0f, 0.0f, 0.0f); int offset = object*OBJECT_SIZE + OBJECT_DUPLI; @@ -222,7 +222,7 @@ ccl_device_inline float3 object_dupli_generated(KernelGlobals *kg, int object) ccl_device_inline float3 object_dupli_uv(KernelGlobals *kg, int object) { - if(object == ~0) + if(object == OBJECT_NONE) return make_float3(0.0f, 0.0f, 0.0f); int offset = object*OBJECT_SIZE + OBJECT_DUPLI; |