[Bf-blender-cvs] [d8f33fc8185] master: Depsgraph: Make has_ prefixed function to return boolean
Sergey Sharybin
noreply at git.blender.org
Fri Nov 24 15:36:17 CET 2017
Commit: d8f33fc81855c8474586140f206b59ac6d92b124
Author: Sergey Sharybin
Date: Fri Nov 24 15:26:54 2017 +0100
Branches: master
https://developer.blender.org/rBd8f33fc81855c8474586140f206b59ac6d92b124
Depsgraph: Make has_ prefixed function to return boolean
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.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/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 838afbbdbbb..c4150e8af7a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -190,9 +190,9 @@ OperationDepsNode *DepsgraphNodeBuilder::add_operation_node(
const char *name,
int name_tag)
{
- OperationDepsNode *op_node = comp_node->has_operation(opcode,
- name,
- name_tag);
+ OperationDepsNode *op_node = comp_node->find_operation(opcode,
+ name,
+ name_tag);
if (op_node == NULL) {
op_node = comp_node->add_operation(op, opcode, name, name_tag);
graph_->operations.push_back(op_node);
@@ -262,7 +262,7 @@ OperationDepsNode *DepsgraphNodeBuilder::find_operation_node(
int name_tag)
{
ComponentDepsNode *comp_node = add_component_node(id, comp_type, comp_name);
- return comp_node->has_operation(opcode, name, name_tag);
+ return comp_node->find_operation(opcode, name, name_tag);
}
OperationDepsNode *DepsgraphNodeBuilder::find_operation_node(
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index f046bc22600..50f0f7532fd 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -293,7 +293,7 @@ OperationDepsNode *DepsgraphRelationBuilder::has_node(
if (!comp_node) {
return NULL;
}
- return comp_node->has_operation(key.opcode, key.name, key.name_tag);
+ return comp_node->find_operation(key.opcode, key.name, key.name_tag);
}
void DepsgraphRelationBuilder::add_time_relation(TimeSourceDepsNode *timesrc,
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index bbf4a46fa78..7a39b1b09e5 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -198,14 +198,14 @@ OperationDepsNode *ComponentDepsNode::get_operation(eDepsOperation_Code opcode,
return get_operation(key);
}
-OperationDepsNode *ComponentDepsNode::has_operation(OperationIDKey key) const
+bool ComponentDepsNode::has_operation(OperationIDKey key) const
{
- return reinterpret_cast<OperationDepsNode *>(BLI_ghash_lookup(operations_map, &key));
+ return find_operation(key) != NULL;
}
-OperationDepsNode *ComponentDepsNode::has_operation(eDepsOperation_Code opcode,
- const char *name,
- int name_tag) const
+bool ComponentDepsNode::has_operation(eDepsOperation_Code opcode,
+ const char *name,
+ int name_tag) const
{
OperationIDKey key(opcode, name, name_tag);
return has_operation(key);
@@ -216,7 +216,7 @@ OperationDepsNode *ComponentDepsNode::add_operation(const DepsEvalOperationCb& o
const char *name,
int name_tag)
{
- OperationDepsNode *op_node = has_operation(opcode, name, name_tag);
+ OperationDepsNode *op_node = find_operation(opcode, name, name_tag);
if (!op_node) {
DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_OPERATION);
op_node = (OperationDepsNode *)factory->create_node(this->owner->id, "", name);
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index a9a5904b4ec..1c21a71737f 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -89,10 +89,10 @@ struct ComponentDepsNode : public DepsNode {
int name_tag) const;
/* Check operation exists and return it. */
- OperationDepsNode *has_operation(OperationIDKey key) const;
- OperationDepsNode *has_operation(eDepsOperation_Code opcode,
- const char *name,
- int name_tag) const;
+ bool has_operation(OperationIDKey key) const;
+ bool has_operation(eDepsOperation_Code opcode,
+ const char *name,
+ int name_tag) const;
/**
* Create a new node for representing an operation and add this to graph
More information about the Bf-blender-cvs
mailing list