Cycles / CPU Rendering:

* "Auto Detect" now again uses the umber of cores, instead number of cores + 1.

This was added before we had Tile rendering and benchmarks on several systems showed that there is no gain with this now. There might be some slight difference (0.5% or so) slower/faster depending on the scene, but this is negligible.

2 files changed, 5 insertions, 5 deletions

diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp
index abcb05561bd..07960805f77 100644
--- a/intern/cycles/util/util_task.cpp
+++ b/intern/cycles/util/util_task.cpp
@@ -186,12 +186,12 @@ void TaskScheduler::init(int num_threads)
 		do_exit = false;
 
 		if(num_threads == 0) {
-			/* automatic number of threads will be main thread + num cores */
+			/* automatic number of threads */
 			num_threads = system_cpu_thread_count();
 		}
 		else {
-			/* main thread will also work, for fixed threads we count it too */
-			num_threads -= 1;
+			/* manual number of threads */
+			num_threads;
 		}
 
 		/* launch threads that will be waiting for work */
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h
index 5bca3f255af..6e002ddd5b1 100644
--- a/intern/cycles/util/util_task.h
+++ b/intern/cycles/util/util_task.h
@@ -94,8 +94,8 @@ public:
 	static void init(int num_threads = 0);
 	static void exit();
 
-	/* number of threads that can work on tasks, main thread counts too */
-	static int num_threads() { return threads.size() + 1; }
+	/* number of threads that can work on task */
+	static int num_threads() { return threads.size(); }
 
 	/* test if any session is using the scheduler */
 	static bool active() { return users != 0; }