[Bf-blender-cvs] [e85601a] depsgraph_refactor: Seed the priority queue with the entry nodes, then wait until all tasks are handled.

Lukas Tönne noreply at git.blender.org
Mon May 26 08:03:53 CEST 2014


Commit: e85601ac15dc6e8a2e951e55dbe76ebe90653485
Author: Lukas Tönne
Date:   Mon May 26 07:52:43 2014 +0200
https://developer.blender.org/rBe85601ac15dc6e8a2e951e55dbe76ebe90653485

Seed the priority queue with the entry nodes, then wait until all tasks
are handled.

===================================================================

M	source/blender/depsgraph/intern/depsgraph_eval.cpp

===================================================================

diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cpp b/source/blender/depsgraph/intern/depsgraph_eval.cpp
index 1b41e98..6fb742a 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cpp
@@ -172,9 +172,7 @@ static void schedule_graph(DepsgraphTaskPool &pool, Depsgraph *graph, eEvaluatio
 		OperationDepsNode *node = *it;
 		
 		if (is_node_ready(node)) {
-			/* XXX TODO */
-//			pool.push();
-//			schedule_node(graph, context_type, node);
+			pool.push(graph, node, context_type);
 		}
 	}
 }
@@ -210,9 +208,7 @@ void DEG_evaluate_on_refresh(Depsgraph *graph, eEvaluationContextType context_ty
 	
 	schedule_graph(task_pool, graph, context_type);
 	
-	/* from the root node, start queuing up nodes to evaluate */
-	// ... start scheduler, etc.
-	// ...
+	task_pool.wait();
 	
 	/* clear any uncleared tags - just in case */
 	DEG_graph_clear_tags(graph);




More information about the Bf-blender-cvs mailing list