Merge branch 'master' into blender2.8

[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_relations.cc

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 10cf6f906de8e197ba2b08648506b8784f45edff..077bdd94f562f5d73815d5241663dbc67d813848 100644 (file)
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1173,9 +1173,9 @@ void DepsgraphRelationBuilder::build_driver_variables(ID *id, FCurve *fcu)
                                        continue;
                                }
                                OperationKey variable_key(dtar->id,
-                                                       DEG_NODE_TYPE_BONE,
-                                                       target_pchan->name,
-                                                       DEG_OPCODE_BONE_DONE);
+                                                         DEG_NODE_TYPE_BONE,
+                                                         target_pchan->name,
+                                                         DEG_OPCODE_BONE_DONE);
                                if (is_same_bone_dependency(variable_key, self_key)) {
                                        continue;
                                }
@@ -1200,10 +1200,13 @@ void DepsgraphRelationBuilder::build_driver_variables(ID *id, FCurve *fcu)
                                if (RNA_pointer_is_null(&variable_key.ptr)) {
                                        continue;
                                }
-                               if (is_same_bone_dependency(variable_key, self_key)) {
+                               if (is_same_bone_dependency(variable_key, self_key) ||
+                                   is_same_nodetree_node_dependency(variable_key, self_key) ||
+                                   is_same_shapekey_dependency(variable_key, self_key))
+                               {
                                        continue;
                                }
-                               add_relation(variable_key, driver_key, "RNA Bone -> Driver");
+                               add_relation(variable_key, driver_key, "RNA Target -> Driver");
                        }
                        else {
                                if (dtar->id == id) {