diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-20 21:07:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-02-20 21:07:25 +0300 |
| commit | 9a9336cb45bd8bfced0c448951843227347bc996 (patch) | |
| tree | fc64609b137a39766f72eca1736c9a295f6ccdf9 /intern | |
| parent | 5df82b60d1dfe980a0314518143349dd918e0e9f (diff) | |
| parent | 848f589fdf36c43ea537f93a8213b5ea362949a3 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/device/opencl/opencl_split.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index 853b2addb20..c8f4c2a94c5 100644 --- a/intern/cycles/device/opencl/opencl_split.cpp +++ b/intern/cycles/device/opencl/opencl_split.cpp @@ -486,7 +486,6 @@ OpenCLDevice::OpenCLDevice(DeviceInfo& info, Stats &stats, Profiler &profiler, b device_initialized = true; split_kernel = new OpenCLSplitKernel(this); - background = background; } OpenCLDevice::~OpenCLDevice() |