[Bf-blender-cvs] [2ccfbf2] master: Cycles: Commit file missing from conditionally compiling baking kernel

[Sergey Sharybin]

Commit: 2ccfbf2f81613d44ae853ebcaeaa1af3560a84b6
Author: Sergey Sharybin
Date:   Sat Jul 18 16:26:41 2015 +0200
Branches: master
https://developer.blender.org/rB2ccfbf2f81613d44ae853ebcaeaa1af3560a84b6

Cycles: Commit file missing from conditionally compiling baking kernel

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

M	intern/cycles/kernel/kernels/opencl/kernel.cl

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

diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl b/intern/cycles/kernel/kernels/opencl/kernel.cl
index 15fb34c..57db6fd 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel.cl
@@ -104,13 +104,7 @@ __kernel void kernel_ocl_bake(
 	int x = sx + get_global_id(0);
 
 	if(x < sx + sw) {
-#if defined(__KERNEL_OPENCL_NVIDIA__) && __COMPUTE_CAPABILITY__ < 300
-		/* NVidia compiler is spending infinite amount of time trying
-		 * to deal with kernel_bake_evaluate() on architectures prior
-		 * to sm_30.
-		 * For now we disable baking kernel for those devices, so at
-		 * least rendering with split kernel could be compiled.
-		 */
+#ifdef __NO_BAKING__
 		output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
 #else
 		kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, x, offset, sample);