diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 08:40:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-18 08:40:31 +0300 |
| commit | 54f9a6e5da06e671f7640c9ec3ac3c305644beb6 (patch) | |
| tree | 6d9968f97e56bdb0758cfea123a1ca00c2bd799a /intern | |
| parent | 0bcb61b2fe94d389332f91762cf07c2691c9fb93 (diff) | |
| parent | 92611dada67fcc151c894462749031be1de27191 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/opencl/opencl_base.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp index 486ef89d22e..6747a8a83ac 100644 --- a/intern/cycles/device/opencl/opencl_base.cpp +++ b/intern/cycles/device/opencl/opencl_base.cpp @@ -1107,7 +1107,7 @@ void OpenCLDeviceBase::shader(DeviceTask& task) if(task.shader_eval_type >= SHADER_EVAL_BAKE) { kernel = base_program(ustring("bake")); } - else if(task.shader_eval_type >= SHADER_EVAL_DISPLACE) { + else if(task.shader_eval_type == SHADER_EVAL_DISPLACE) { kernel = base_program(ustring("displace")); } else { |