[Bf-blender-cvs] [a8b97b2e418] master: Depsgraph: Deduplicate operation node finding logic

[Sergey Sharybin]

Commit: a8b97b2e418fbc9afed780275d4318c0cb9c9c8c
Author: Sergey Sharybin
Date:   Fri Nov 24 15:35:42 2017 +0100
Branches: master
https://developer.blender.org/rBa8b97b2e418fbc9afed780275d4318c0cb9c9c8c

Depsgraph: Deduplicate operation node finding logic

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 304ea8f6912..293f63e9db2 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -253,23 +253,8 @@ ComponentDepsNode *DepsgraphRelationBuilder::get_node(
 OperationDepsNode *DepsgraphRelationBuilder::get_node(
         const OperationKey &key) const
 {
-	IDDepsNode *id_node = graph_->find_id_node(key.id);
-	if (!id_node) {
-		fprintf(stderr, "find_node operation: Could not find ID\n");
-		return NULL;
-	}
-
-	ComponentDepsNode *comp_node = id_node->find_component(key.component_type,
-	                                                       key.component_name);
-	if (!comp_node) {
-		fprintf(stderr, "find_node operation: Could not find component\n");
-		return NULL;
-	}
-
-	OperationDepsNode *op_node = comp_node->get_operation(key.opcode,
-	                                                      key.name,
-	                                                      key.name_tag);
-	if (!op_node) {
+	OperationDepsNode *op_node = find_node(key);
+	if (op_node == NULL) {
 		fprintf(stderr, "find_node_operation: Failed for (%s, '%s')\n",
 		        DEG_OPNAMES[key.opcode], key.name);
 	}