diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-26 22:07:36 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-26 22:07:36 +0300 |
| commit | 4d9697a5a90de08d30de373cf6dc83f8130fffdc (patch) | |
| tree | 8c4d4b7d2a06f4a9aad42f767035161b20f74518 /intern | |
| parent | 2977eb5a0e7e53531a156136e7c7df6022b6d684 (diff) | |
| parent | 6b6d1e424c5b85d685d4aa8fa65cd22cd92939be (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/opencl/opencl_split.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index 06eba52cec8..2e2eb775fdc 100644 --- a/intern/cycles/device/opencl/opencl_split.cpp +++ b/intern/cycles/device/opencl/opencl_split.cpp @@ -1724,11 +1724,9 @@ void OpenCLDevice::shader(DeviceTask& task) kernel = bake_program(ustring("bake")); } else if(task.shader_eval_type == SHADER_EVAL_DISPLACE) { - assert(displace_program()); kernel = displace_program(ustring("displace")); } else { - assert(background_program()); kernel = background_program(ustring("background")); } |