Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_relations_impl.h
index 570227601db656160850516c1fd688d3ce03d4dd..894d4172c0041f9006c6e8201987a1ecc1d6d5c8 100644 (file)
@@ -184,7 +184,7 @@ bool DepsgraphRelationBuilder::is_same_nodetree_node_dependency(
                return false;
        }
        /* Check if this is actually a node tree. */
-       if (GS(op_from->owner->owner->id->name) != ID_NT) {
+       if (GS(op_from->owner->owner->id_orig->name) != ID_NT) {
                return false;
        }
        /* Different node trees. */
@@ -217,7 +217,7 @@ bool DepsgraphRelationBuilder::is_same_shapekey_dependency(
                return false;
        }
        /* Check if this is actually a shape key datablock. */
-       if (GS(op_from->owner->owner->id->name) != ID_KE) {
+       if (GS(op_from->owner->owner->id_orig->name) != ID_KE) {
                return false;
        }
        /* Different key data blocks. */