From a3deef6fff7c395512cf56a64d6e026f84d95db2 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 12 Jan 2022 23:40:05 +0100 Subject: Fix Cycles CPU + GPU render not using CPU after recent changes In some places the task scheduler was not initialized in time. --- intern/cycles/device/device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/device/device.cpp') diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index d3de6c54a17..14c97affb76 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -334,7 +334,7 @@ DeviceInfo Device::get_multi_device(const vector &subdevices, /* Ensure CPU device does not slow down GPU. */ if (device.type == DEVICE_CPU && subdevices.size() > 1) { if (background) { - int orig_cpu_threads = (threads) ? threads : TaskScheduler::num_threads(); + int orig_cpu_threads = (threads) ? threads : TaskScheduler::max_concurrency(); int cpu_threads = max(orig_cpu_threads - (subdevices.size() - 1), 0); VLOG(1) << "CPU render threads reduced from " << orig_cpu_threads << " to " << cpu_threads -- cgit v1.2.3