Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-24 17:34:53 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-24 17:34:53 +0300
commitd23236329085d0074efa8d7c54e7836e44165094 (patch)
treee5431bf3a9fa117f14a322c7ead3f0e4fed21aeb
parentd80c1e1e110bde06c9a5f6ae6566278d8641b756 (diff)
Depsgraph: Use proper return type for find_node method
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc7
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.h4
2 files changed, 9 insertions, 2 deletions
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,