diff options
author | Jacques Lucke <jacques@blender.org> | 2020-02-28 11:01:15 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-02-28 11:01:15 +0300 |
commit | 4ed7334ef617abc3f3fabbca4fe3e128f74020c2 (patch) | |
tree | edd7dcae4a5b9ed764d4471b4b63f992ede777a7 /source/blender/depsgraph/intern/depsgraph_relation.cc | |
parent | b92b1a4fe56338c7a66dda4f27426c10e070b11c (diff) | |
parent | 9cac5fa681c55edcf6e856e59e07e90e2ae25965 (diff) |
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_relation.cc')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_relation.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_relation.cc b/source/blender/depsgraph/intern/depsgraph_relation.cc index 1b2de2cc807..cff62540ca8 100644 --- a/source/blender/depsgraph/intern/depsgraph_relation.cc +++ b/source/blender/depsgraph/intern/depsgraph_relation.cc @@ -42,7 +42,7 @@ Relation::Relation(Node *from, Node *to, const char *description) /* Hook it up to the nodes which use it. * * NOTE: We register relation in the nodes which this link connects to here - * in constructor but we don't unregister it in the destructor. + * in constructor but we don't un-register it in the destructor. * * Reasoning: * @@ -50,7 +50,7 @@ Relation::Relation(Node *from, Node *to, const char *description) * real need in avoiding dangling pointers, all the memory is to be freed * anyway. * - * - Unregistering relation is not a cheap operation, so better to have it + * - Un-registering relation is not a cheap operation, so better to have it * as an explicit call if we need this. */ from->outlinks.push_back(this); to->inlinks.push_back(this); |