[Bf-blender-cvs] [f6b2fbb0292] master: Depsgraph: Remove evaluation priority completely

Sergey Sharybin noreply at git.blender.org
Thu Dec 21 11:15:38 CET 2017


Commit: f6b2fbb02922e9c303b95ffbdd93cd047a640338
Author: Sergey Sharybin
Date:   Thu Dec 21 11:15:21 2017 +0100
Branches: master
https://developer.blender.org/rBf6b2fbb02922e9c303b95ffbdd93cd047a640338

Depsgraph: Remove evaluation priority completely

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

M	source/blender/depsgraph/intern/depsgraph_eval.cc
M	source/blender/depsgraph/intern/nodes/deg_node_operation.cc
M	source/blender/depsgraph/intern/nodes/deg_node_operation.h

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

diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index ab10f9730c0..0448dbe2c8d 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -57,9 +57,6 @@ extern "C" {
 static bool use_legacy_depsgraph = true;
 #endif
 
-/* Unfinished and unused, and takes quite some pre-processing time. */
-#undef USE_EVAL_PRIORITY
-
 bool DEG_depsgraph_use_legacy(void)
 {
 #ifdef DISABLE_NEW_DEPSGRAPH
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
index 0fc87a52005..cbc0fbb4241 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
@@ -45,7 +45,6 @@ namespace DEG {
 /* Inner Nodes */
 
 OperationDepsNode::OperationDepsNode() :
-    eval_priority(0.0f),
     flag(0),
     customdata_mask(0)
 {
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.h b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
index ffb95a53b5d..c172f73be5f 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.h
@@ -76,7 +76,6 @@ struct OperationDepsNode : public DepsNode {
 
 	/* How many inlinks are we still waiting on before we can be evaluated. */
 	uint32_t num_links_pending;
-	float eval_priority;
 	bool scheduled;
 
 	/* Identifier for the operation being performed. */



More information about the Bf-blender-cvs mailing list