diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-11-03 16:22:41 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-20 13:36:53 +0300 |
commit | 1d5833caf552c53deadf1f7f675623e5cccf09bb (patch) | |
tree | 274279889add249cca1a1110af4a9ba6dde71551 | |
parent | 507599270fdddeee8abe2b5cd9fa5dd217f55c79 (diff) |
Depsgraph: Cleanup, operation has name, not description
Hopefully should make things more clear here.
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 26 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.h | 12 |
2 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index ca5ee838917..ea319cbe8fd 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -190,11 +190,11 @@ OperationDepsNode *DepsgraphNodeBuilder::add_operation_node( eDepsOperation_Type optype, DepsEvalOperationCb op, eDepsOperation_Code opcode, - const string &description) + const string &name) { - OperationDepsNode *op_node = comp_node->has_operation(opcode, description); + OperationDepsNode *op_node = comp_node->has_operation(opcode, name); if (op_node == NULL) { - op_node = comp_node->add_operation(optype, op, opcode, description); + op_node = comp_node->add_operation(optype, op, opcode, name); m_graph->operations.push_back(op_node); } else { @@ -215,10 +215,10 @@ OperationDepsNode *DepsgraphNodeBuilder::add_operation_node( eDepsOperation_Type optype, DepsEvalOperationCb op, eDepsOperation_Code opcode, - const string &description) + const string &name) { ComponentDepsNode *comp_node = add_component_node(id, comp_type, comp_name); - return add_operation_node(comp_node, optype, op, opcode, description); + return add_operation_node(comp_node, optype, op, opcode, name); } OperationDepsNode *DepsgraphNodeBuilder::add_operation_node( @@ -227,22 +227,22 @@ OperationDepsNode *DepsgraphNodeBuilder::add_operation_node( eDepsOperation_Type optype, DepsEvalOperationCb op, eDepsOperation_Code opcode, - const string& description) + const string& name) { - return add_operation_node(id, comp_type, "", optype, op, opcode, description); + return add_operation_node(id, comp_type, "", optype, op, opcode, name); } bool DepsgraphNodeBuilder::has_operation_node(ID *id, eDepsNode_Type comp_type, const char *comp_name, eDepsOperation_Code opcode, - const string &description) + const string &name) { return find_operation_node(id, comp_type, comp_name, opcode, - description) != NULL; + name) != NULL; } OperationDepsNode *DepsgraphNodeBuilder::find_operation_node( @@ -250,19 +250,19 @@ OperationDepsNode *DepsgraphNodeBuilder::find_operation_node( eDepsNode_Type comp_type, const char *comp_name, eDepsOperation_Code opcode, - const string &description) + const string &name) { ComponentDepsNode *comp_node = add_component_node(id, comp_type, comp_name); - return comp_node->has_operation(opcode, description); + return comp_node->has_operation(opcode, name); } OperationDepsNode *DepsgraphNodeBuilder::find_operation_node( ID *id, eDepsNode_Type comp_type, eDepsOperation_Code opcode, - const string& description) + const string& name) { - return find_operation_node(id, comp_type, "", opcode, description); + return find_operation_node(id, comp_type, "", opcode, name); } /* **** Build functions for entity nodes **** */ diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index 20fe6c5db92..539543cfde3 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -82,37 +82,37 @@ struct DepsgraphNodeBuilder { eDepsOperation_Type optype, DepsEvalOperationCb op, eDepsOperation_Code opcode, - const string& description = ""); + const string& name = ""); OperationDepsNode *add_operation_node(ID *id, eDepsNode_Type comp_type, const char *comp_name, eDepsOperation_Type optype, DepsEvalOperationCb op, eDepsOperation_Code opcode, - const string& description = ""); + const string& name = ""); OperationDepsNode *add_operation_node(ID *id, eDepsNode_Type comp_type, eDepsOperation_Type optype, DepsEvalOperationCb op, eDepsOperation_Code opcode, - const string& description = ""); + const string& name = ""); bool has_operation_node(ID *id, eDepsNode_Type comp_type, const char *comp_name, eDepsOperation_Code opcode, - const string& description = ""); + const string& name = ""); OperationDepsNode *find_operation_node(ID *id, eDepsNode_Type comp_type, const char *comp_name, eDepsOperation_Code opcode, - const string &description = ""); + const string &name = ""); OperationDepsNode *find_operation_node(ID *id, eDepsNode_Type comp_type, eDepsOperation_Code opcode, - const string &description = ""); + const string &name = ""); void build_scene(Main *bmain, Scene *scene); SubgraphDepsNode *build_subgraph(Group *group); |