svn merge ^/trunk/blender -r47023:HEAD
[blender-staging.git] / intern / cycles / util / util_task.h
index 6b7562c22674ae615387ed450244262cedd49a5c..401a503f5401dae80bc5b26c1592562dcfb76b4d 100644 (file)
@@ -73,12 +73,13 @@ public:
 protected:
        friend class TaskScheduler;
 
-       void done_increase(int done);
+       void num_decrease(int done);
+       void num_increase();
 
-       thread_mutex done_mutex;
-       thread_condition_variable done_cond;
+       thread_mutex num_mutex;
+       thread_condition_variable num_cond;
 
-       volatile int num, num_done;
+       volatile int num;
        volatile bool do_cancel;
 };