blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

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.
This commit is contained in:
Lukas Stockner 2016-10-17 12:28:01 +02:00
parent d5dd12e56c
commit cd843409d3
Notes: blender-bot 2023-02-14 09:48:25 +01:00 
Referenced by issue #49630, regression MIS Split kernel OpenCL
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/device/opencl/opencl_base.cpp
View File

@ -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,