Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2014-03-09 15:47:26 +0400
committerThomas Dinges <blender@dingto.org>2014-03-09 15:48:58 +0400
commita96eb73a1214900d43acb291b408f42b954747cd (patch)
treecf5b5631c6e01f479b48caa41e6acaf3e8b70c1d /intern/cycles/kernel/kernel_light.h
parent40d4fb9fce92568f7cbbe634c759bd555266e47c (diff)
Code Cleanup for __HAIR__ defines.
Diffstat (limited to 'intern/cycles/kernel/kernel_light.h')
-rw-r--r--intern/cycles/kernel/kernel_light.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index c32f0395744..79ef86a8662 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -575,10 +575,8 @@ ccl_device void light_sample(KernelGlobals *kg, float randt, float randu, float
int object = __float_as_int(l.w);
#ifdef __HAIR__
int segment = __float_as_int(l.z) & SHADER_MASK;
-#endif
-#ifdef __HAIR__
- if (segment != SHADER_MASK)
+ if(segment != SHADER_MASK)
curve_segment_light_sample(kg, prim, object, segment, randu, randv, time, ls);
else
#endif