diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-10-17 13:28:01 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-10-17 13:28:01 +0300 |
| commit | cd843409d3b702d319d841a07849ea8824414083 (patch) | |
| tree | 0b85c5ffa5d76baf3c4241682e0edeb46f0fc62c | |
| parent | d5dd12e56cd142c8d95cdb538658bae45a3f510c (diff) | |
Fix T49630: Cycles: Swapped shader and bake kernels
The problem here was, as the title says, that the two kernels were swapped.
Since shader evaluation is only used for building the samling map when World MIS is enabled, rendering without it would still work fine, although baking also was broken.
| -rw-r--r-- | intern/cycles/device/opencl/opencl_base.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp index 025a61c8e27..ea65be31195 100644 --- a/intern/cycles/device/opencl/opencl_base.cpp +++ b/intern/cycles/device/opencl/opencl_base.cpp @@ -489,9 +489,9 @@ void OpenCLDeviceBase::shader(DeviceTask& task) cl_kernel kernel; if(task.shader_eval_type >= SHADER_EVAL_BAKE) - kernel = base_program(ustring("shader")); - else kernel = base_program(ustring("bake")); + else + kernel = base_program(ustring("shader")); cl_uint start_arg_index = kernel_set_args(kernel, |