Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Nov 2017 14:40:53 +0000 (15:40 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 24 Nov 2017 14:40:53 +0000 (15:40 +0100)
1  2 
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/nodes/deg_node_component.cc
source/blender/depsgraph/intern/nodes/deg_node_component.h

index bba16316288905e1bdfd8ba5d8c05248e44ec4bd,937b01ce206569e684438201c0ca8a564562d7c4..c22e74f4577cfc8d276f711e32c52c477b540d48
@@@ -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);