Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_relations.cc
index dde8555ab9ee4c44eff745e3bc362a604a004496..077bdd94f562f5d73815d5241663dbc67d813848 100644 (file)
@@ -1201,7 +1201,8 @@ void DepsgraphRelationBuilder::build_driver_variables(ID *id, FCurve *fcu)
                                        continue;
                                }
                                if (is_same_bone_dependency(variable_key, self_key) ||
-                                   is_nodetree_node_dependency(variable_key, self_key))
+                                   is_same_nodetree_node_dependency(variable_key, self_key) ||
+                                   is_same_shapekey_dependency(variable_key, self_key))
                                {
                                        continue;
                                }