Fix Cycles CPU + GPU render not using CPU after recent changes

In some places the task scheduler was not initialized in time.

2 files changed, 6 insertions, 6 deletions

diff --git a/intern/cycles/util/task.cpp b/intern/cycles/util/task.cpp
index eeccbaf1c44..174befce571 100644
--- a/intern/cycles/util/task.cpp
+++ b/intern/cycles/util/task.cpp
@@ -109,9 +109,10 @@ void TaskScheduler::free_memory()
   assert(users == 0);
 }
 
-int TaskScheduler::num_threads()
+int TaskScheduler::max_concurrency()
 {
-  return active_num_threads;
+  thread_scoped_lock lock(mutex);
+  return (users > 0) ? active_num_threads : tbb::this_task_arena::max_concurrency();
 }
 
 /* Dedicated Task Pool */
diff --git a/intern/cycles/util/task.h b/intern/cycles/util/task.h
index 1a8f512b83a..0117c51d05c 100644
--- a/intern/cycles/util/task.h
+++ b/intern/cycles/util/task.h
@@ -86,10 +86,9 @@ class TaskScheduler {
   static void exit();
   static void free_memory();
 
-  /* Approximate number of threads that will work on task, which may be lower
-   * or higher than the actual number of threads. Use as little as possible and
-   * leave splitting up tasks to the scheduler. */
-  static int num_threads();
+  /* Maximum number of threads that will work on task. Use as little as
+   * possible and leave scheduling and splitting up tasks to the scheduler. */
+  static int max_concurrency();
 
  protected:
   static thread_mutex mutex;