diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-21 17:33:07 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-21 17:33:07 +0300 |
| commit | 8986c92b651ddf7ec6b5b71f70a92a3d08b250b5 (patch) | |
| tree | 0324dba633dd689d38927fa6c0f40cd9c7723cbb /intern/cycles/kernel | |
| parent | d518438479fea395970ddf7395d71452cbe1e57b (diff) | |
| parent | 1d38a83139582ff37adc0757bd39d87d5932ddf5 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_background.cl | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_displace.cl | 4 |
2 files changed, 0 insertions, 8 deletions
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 8dcfd91a2fa..76cc36971f5 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 } } |