Fix T40306: cycles baking not distributing work among CPU cores well.

1 files changed, 12 insertions, 13 deletions

diff --git a/intern/cycles/device/device_task.cpp b/intern/cycles/device/device_task.cpp
index 7d0eeab780d..f436b54df68 100644
--- a/intern/cycles/device/device_task.cpp
+++ b/intern/cycles/device/device_task.cpp
@@ -35,23 +35,22 @@ DeviceTask::DeviceTask(Type type_)
 	last_update_time = time_dt();
 }
 
-void DeviceTask::split_max_size(list<DeviceTask>& tasks, int max_size)
+void DeviceTask::split(list<DeviceTask>& tasks, int num, int max_size)
 {
-	int num;
+	if(max_size != 0) {
+		int max_size_num;
 
-	if(type == SHADER) {
-		num = (shader_w + max_size - 1)/max_size;
-	}
-	else {
-		max_size = max(1, max_size/w);
-		num = (h + max_size - 1)/max_size;
-	}
+		if(type == SHADER) {
+			max_size_num = (shader_w + max_size - 1)/max_size;
+		}
+		else {
+			max_size = max(1, max_size/w);
+			max_size_num = (h + max_size - 1)/max_size;
+		}
 
-	split(tasks, num);
-}
+		num = max(max_size_num, num);
+	}
 
-void DeviceTask::split(list<DeviceTask>& tasks, int num)
-{
 	if(type == SHADER) {
 		num = min(shader_w, num);