diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
| commit | dc13969e484ed9fa6834b1aba85ba00f65bf8a11 (patch) | |
| tree | affc2efd3e5c8637fbfcaf0b3be87a78781876b9 /intern/cycles/kernel/kernel_shadow.h | |
| parent | e86dbf687769a7f38ab465c89d1111a8be691ca2 (diff) | |
Style cleanup: indentation, braces
Diffstat (limited to 'intern/cycles/kernel/kernel_shadow.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_shadow.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h index b350e068177..ab7524c411a 100644 --- a/intern/cycles/kernel/kernel_shadow.h +++ b/intern/cycles/kernel/kernel_shadow.h @@ -190,7 +190,7 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray * ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *ray, float3 *shadow) { -*shadow = make_float3(1.0f, 1.0f, 1.0f); + *shadow = make_float3(1.0f, 1.0f, 1.0f); if(ray->t == 0.0f) return false; @@ -217,10 +217,11 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray * return true; #ifdef __HAIR__ - if(!scene_intersect(kg, ray, PATH_RAY_SHADOW_TRANSPARENT, &isect, NULL, 0.0f, 0.0f)) { + if(!scene_intersect(kg, ray, PATH_RAY_SHADOW_TRANSPARENT, &isect, NULL, 0.0f, 0.0f)) #else - if(!scene_intersect(kg, ray, PATH_RAY_SHADOW_TRANSPARENT, &isect)) { + if(!scene_intersect(kg, ray, PATH_RAY_SHADOW_TRANSPARENT, &isect)) #endif + { #ifdef __VOLUME__ /* attenuation for last line segment towards light */ |