Merge branch 'master' into blender2.8

2017-11-24 15:46:10 +01:00 · 2017-11-24 15:46:10 +01:00 · 56367cfeb3
parent c546fb9e85 1caa267ee6
commit 56367cfeb3
1 changed files with 2 additions and 2 deletions
--- 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)