[Bf-blender-cvs] [fab6c5040da] blender2.7: Fix: OpenCL Displacement and light sampling

[Jeroen Bakker]

Commit: fab6c5040da8ed925650db1d68ecffe248ffdf57
Author: Jeroen Bakker
Date:   Thu Feb 21 08:11:02 2019 +0100
Branches: blender2.7
https://developer.blender.org/rBfab6c5040da8ed925650db1d68ecffe248ffdf57

Fix: OpenCL Displacement and light sampling

The bake kernels are also used during mesh displacement and light
importance sampling. We disabled the implementation of these kernels
when baking was not enabled.

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

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

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

diff --git a/intern/cycles/kernel/kernels/opencl/kernel_background.cl b/intern/cycles/kernel/kernels/opencl/kernel_background.cl
index c7c709c0ad7..0e600676e82 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_background.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_background.cl
@@ -30,10 +30,6 @@ __kernel void kernel_ocl_background(
 	int x = sx + ccl_global_id(0);
 
 	if(x < sx + sw) {
-#ifdef __NO_BAKING__
-		output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
-#else
 		kernel_background_evaluate(kg, input, output, x);
-#endif
 	}
 }
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_displace.cl b/intern/cycles/kernel/kernels/opencl/kernel_displace.cl
index 288bfd5eadc..761badb751a 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel_displace.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel_displace.cl
@@ -30,11 +30,7 @@ __kernel void kernel_ocl_displace(
 	int x = sx + ccl_global_id(0);
 
 	if(x < sx + sw) {
-#ifdef __NO_BAKING__
-		output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f);
-#else
 		kernel_displace_evaluate(kg, input, output, x);
-#endif
 	}
 }