[Bf-blender-cvs] [c546fb9e85d] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: c546fb9e85d8cd056378fdc90b6858e3b0a68bf2
Author: Sergey Sharybin
Date:   Fri Nov 24 15:40:53 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBc546fb9e85d8cd056378fdc90b6858e3b0a68bf2

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/depsgraph/intern/nodes/deg_node_component.cc
index bba16316288,937b01ce206..c22e74f4577
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@@ -214,10 -229,10 +225,10 @@@ OperationDepsNode *ComponentDepsNode::a
                                                      const char *name,
                                                      int name_tag)
  {
- 	OperationDepsNode *op_node = has_operation(opcode, name, name_tag);
+ 	OperationDepsNode *op_node = find_operation(opcode, name, name_tag);
  	if (!op_node) {
  		DepsNodeFactory *factory = deg_get_node_factory(DEG_NODE_TYPE_OPERATION);
 -		op_node = (OperationDepsNode *)factory->create_node(this->owner->id, "", name);
 +		op_node = (OperationDepsNode *)factory->create_node(this->owner->id_orig, "", name);
  
  		/* register opnode in this component's operation set */
  		OperationIDKey *key = OBJECT_GUARDED_NEW(OperationIDKey, opcode, name, name_tag);