[Bf-blender-cvs] [68654c0be54] master: Depsgraph: Make more clear what find_operation() is doing for component

[Sergey Sharybin]

Commit: 68654c0be54cc11e3ce10e664f19121dfb02335a
Author: Sergey Sharybin
Date:   Fri Nov 24 15:21:50 2017 +0100
Branches: master
https://developer.blender.org/rB68654c0be54cc11e3ce10e664f19121dfb02335a

Depsgraph: Make more clear what find_operation() is doing for component

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

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_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 67faa59bbc3..f046bc22600 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -266,9 +266,9 @@ OperationDepsNode *DepsgraphRelationBuilder::find_node(
 		return NULL;
 	}
 
-	OperationDepsNode *op_node = comp_node->find_operation(key.opcode,
-	                                                       key.name,
-	                                                       key.name_tag);
+	OperationDepsNode *op_node = comp_node->get_operation(key.opcode,
+	                                                      key.name,
+	                                                      key.name_tag);
 	if (!op_node) {
 		fprintf(stderr, "find_node_operation: Failed for (%s, '%s')\n",
 		        DEG_OPNAMES[key.opcode], key.name);
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 26678d5b23a..f520fc7ef52 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -163,7 +163,7 @@ string ComponentDepsNode::identifier() const
 	return string(typebuf) + name + " : " + idname + " (Layers: " + layers + ")";
 }
 
-OperationDepsNode *ComponentDepsNode::find_operation(OperationIDKey key) const
+OperationDepsNode *ComponentDepsNode::get_operation(OperationIDKey key) const
 {
 	OperationDepsNode *node = reinterpret_cast<OperationDepsNode *>(BLI_ghash_lookup(operations_map, &key));
 	if (node != NULL) {
@@ -177,12 +177,12 @@ OperationDepsNode *ComponentDepsNode::find_operation(OperationIDKey key) const
 	}
 }
 
-OperationDepsNode *ComponentDepsNode::find_operation(eDepsOperation_Code opcode,
-                                                     const char *name,
-                                                     int name_tag) const
+OperationDepsNode *ComponentDepsNode::get_operation(eDepsOperation_Code opcode,
+                                                    const char *name,
+                                                    int name_tag) const
 {
 	OperationIDKey key(opcode, name, name_tag);
-	return find_operation(key);
+	return get_operation(key);
 }
 
 OperationDepsNode *ComponentDepsNode::has_operation(OperationIDKey key) const
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index eddef3f6635..39365ad31af 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -75,10 +75,10 @@ struct ComponentDepsNode : public DepsNode {
 	string identifier() const;
 
 	/* Find an existing operation, will throw an assert() if it does not exist. */
-	OperationDepsNode *find_operation(OperationIDKey key) const;
-	OperationDepsNode *find_operation(eDepsOperation_Code opcode,
-	                                  const char *name,
-	                                  int name_tag) const;
+	OperationDepsNode *get_operation(OperationIDKey key) const;
+	OperationDepsNode *get_operation(eDepsOperation_Code opcode,
+	                                 const char *name,
+	                                 int name_tag) const;
 
 	/* Check operation exists and return it. */
 	OperationDepsNode *has_operation(OperationIDKey key) const;