[Bf-blender-cvs] [a96eb73] master: Code Cleanup for __HAIR__ defines.

[Thomas Dinges]

Commit: a96eb73a1214900d43acb291b408f42b954747cd
Author: Thomas Dinges
Date:   Sun Mar 9 12:47:26 2014 +0100
https://developer.blender.org/rBa96eb73a1214900d43acb291b408f42b954747cd

Code Cleanup for __HAIR__ defines.

===================================================================

M	intern/cycles/kernel/kernel_light.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index c32f039..79ef86a 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