Commit: 385b757fbf3912397b3442be200c866f0d641f8e
Author: Sergey Sharybin
Date: Wed Jun 8 16:56:23 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB385b757fbf3912397b3442be200c866f0d641f8e
Depsgraph: Remove unused code
Became obsolete after recent changes.
===================================================================
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/nodes/deg_node_component.cc
M source/blender/depsgraph/intern/nodes/deg_node_component.h
===================================================================
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 0651210..fda665b 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -85,8 +85,7 @@ static void flush_init_func(void *data_v, int i)
id_node->done = 0;
comp_node->done = 0;
node->scheduled = false;
- node->owner->flags &= ~DEPSCOMP_FULLY_SCHEDULED;
- if (node->owner->type == DEPSNODE_TYPE_PROXY) {
+ if (comp_node->type == DEPSNODE_TYPE_PROXY) {
node->flag |= DEPSOP_FLAG_NEEDS_UPDATE;
}
}
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 7e49fec..8e74317 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -86,7 +86,6 @@ static void comp_node_hash_value_free(void *value_v)
ComponentDepsNode::ComponentDepsNode() :
entry_operation(NULL),
exit_operation(NULL),
- flags(0),
layers(0)
{
operations_map = BLI_ghash_new(comp_node_hash_key,
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h
b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index df321ea..6ff4345 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -47,13 +47,6 @@ struct Depsgraph;
struct OperationDepsNode;
struct BoneComponentDepsNode;
-typedef enum eDepsComponent_Flag {
- /* Temporary flags, meaning all the component's operations has been
- * scheduled for update.
- */
- DEPSCOMP_FULLY_SCHEDULED = 1,
-} eDepsComponent_Flag;
-
/* ID Component - Base type for all components */
struct ComponentDepsNode : public DepsNode {
/* Key used to look up operations within a component */
@@ -165,8 +158,6 @@ struct ComponentDepsNode : public DepsNode {
// XXX: a poll() callback to check if component's first node can be
started?
- int flags;
-
/* Temporary bitmask, used during graph construction. */
int layers;
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
