From a96eb73a1214900d43acb291b408f42b954747cd Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sun, 9 Mar 2014 12:47:26 +0100 Subject: [PATCH] Code Cleanup for __HAIR__ defines. --- intern/cycles/kernel/kernel_light.h | 4 +--- 1 file changed, 1 insertion(+), 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