diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-01-13 01:40:05 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-13 12:40:41 +0300 |
| commit | a3deef6fff7c395512cf56a64d6e026f84d95db2 (patch) | |
| tree | c2cca7e8582c80b6f349391f6f847529d0744468 /intern/cycles/device/cpu | |
| parent | eaa4cdaa4230d69b470d229017bad27c03c9ef14 (diff) | |
Fix Cycles CPU + GPU render not using CPU after recent changes
In some places the task scheduler was not initialized in time.
Diffstat (limited to 'intern/cycles/device/cpu')
| -rw-r--r-- | intern/cycles/device/cpu/device_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp index 6f3c8b42124..0ca24c241f0 100644 --- a/intern/cycles/device/cpu/device_impl.cpp +++ b/intern/cycles/device/cpu/device_impl.cpp @@ -72,7 +72,7 @@ CPUDevice::CPUDevice(const DeviceInfo &info_, Stats &stats_, Profiler &profiler_ << " CPU kernels."; if (info.cpu_threads == 0) { - info.cpu_threads = TaskScheduler::num_threads(); + info.cpu_threads = TaskScheduler::max_concurrency(); } #ifdef WITH_OSL |