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/kernel_shadow.h | |
| parent | 6997908afc38a3c98d09939f3b46f10d7a165d2e (diff) | |
Cycles code refactor: replace magic ~0 values in the code with defines.
Diffstat (limited to 'intern/cycles/kernel/kernel_shadow.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_shadow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h index 9b015c98c40..971dca38fc5 100644 --- a/intern/cycles/kernel/kernel_shadow.h +++ b/intern/cycles/kernel/kernel_shadow.h @@ -73,7 +73,7 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray * #ifdef __VOLUME__ /* attenuation for last line segment towards light */ - if(ps.volume_stack[0].shader != SHADER_NO_ID) + if(ps.volume_stack[0].shader != SHADER_NONE) kernel_volume_shadow(kg, &ps, ray, &throughput); #endif @@ -86,7 +86,7 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray * #ifdef __VOLUME__ /* attenuation between last surface and next surface */ - if(ps.volume_stack[0].shader != SHADER_NO_ID) { + if(ps.volume_stack[0].shader != SHADER_NONE) { Ray segment_ray = *ray; segment_ray.t = isect.t; kernel_volume_shadow(kg, &ps, &segment_ray, &throughput); @@ -118,7 +118,7 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray * } } #ifdef __VOLUME__ - else if(!result && state->volume_stack[0].shader != SHADER_NO_ID) { + else if(!result && state->volume_stack[0].shader != SHADER_NONE) { /* apply attenuation from current volume shader */ kernel_volume_shadow(kg, state, ray, shadow); } |