[Bf-blender-cvs] [d2323632908] master: Depsgraph: Use proper return type for find_node method

Sergey Sharybin noreply at git.blender.org
Fri Nov 24 15:36:20 CET 2017


Commit: d23236329085d0074efa8d7c54e7836e44165094
Author: Sergey Sharybin
Date:   Fri Nov 24 15:34:53 2017 +0100
Branches: master
https://developer.blender.org/rBd23236329085d0074efa8d7c54e7836e44165094

Depsgraph: Use proper return type for find_node method

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

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

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 89b1848cd85..304ea8f6912 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -281,7 +281,7 @@ DepsNode *DepsgraphRelationBuilder::get_node(const RNAPathKey &key) const
 	return graph_->find_node_from_pointer(&key.ptr, key.prop);
 }
 
-OperationDepsNode *DepsgraphRelationBuilder::has_node(
+OperationDepsNode *DepsgraphRelationBuilder::find_node(
         const OperationKey &key) const
 {
 	IDDepsNode *id_node = graph_->find_id_node(key.id);
@@ -296,6 +296,11 @@ OperationDepsNode *DepsgraphRelationBuilder::has_node(
 	return comp_node->find_operation(key.opcode, key.name, key.name_tag);
 }
 
+bool DepsgraphRelationBuilder::has_node(const OperationKey &key) const
+{
+	return find_node(key) != NULL;
+}
+
 void DepsgraphRelationBuilder::add_time_relation(TimeSourceDepsNode *timesrc,
                                                  DepsNode *node_to,
                                                  const char *description)
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index 8392b0f1c08..68762043e5e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -249,7 +249,9 @@ protected:
 	ComponentDepsNode *get_node(const ComponentKey &key) const;
 	OperationDepsNode *get_node(const OperationKey &key) const;
 	DepsNode *get_node(const RNAPathKey &key) const;
-	OperationDepsNode *has_node(const OperationKey &key) const;
+
+	OperationDepsNode *find_node(const OperationKey &key) const;
+	bool has_node(const OperationKey &key) const;
 
 	void add_time_relation(TimeSourceDepsNode *timesrc,
 	                       DepsNode *node_to,



More information about the Bf-blender-cvs mailing list