diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-24 17:46:10 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-24 17:46:10 +0300 |
| commit | 56367cfeb320982d1f07b200a3c98b9493cc6e33 (patch) | |
| tree | 52a2f6ac834b9667db4e6b53e944c08cdceafd53 /source | |
| parent | c546fb9e85d8cd056378fdc90b6858e3b0a68bf2 (diff) | |
| parent | 1caa267ee6e39303c1782eae895ed9452c142231 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/depsgraph/intern/nodes/deg_node_component.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc index c22e74f4577..01181453982 100644 --- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc +++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc @@ -87,8 +87,8 @@ bool ComponentDepsNode::OperationIDKey::operator==( const OperationIDKey &other) const { return (opcode == other.opcode) && - (STREQ(name, other.name)) && - (name_tag == other.name_tag); + (STREQ(name, other.name)) && + (name_tag == other.name_tag); } static unsigned int comp_node_hash_key(const void *key_v) |