[Bf-blender-cvs] [b0d0179d60f] blender2.8: Depsgraph: fix missing relations for drivers on ShaderNode properties.

[Alexander Gavrilov]

Commit: b0d0179d60ffc287a157bbab56516262b21d5a97
Author: Alexander Gavrilov
Date:   Tue Nov 13 21:09:27 2018 +0300
Branches: blender2.8
https://developer.blender.org/rBb0d0179d60ffc287a157bbab56516262b21d5a97

Depsgraph: fix missing relations for drivers on ShaderNode properties.

Also fix duplicate driver to target relations due to a redundant line.

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/depsgraph.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 28e06339c64..d336bfb6188 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1400,7 +1400,6 @@ void DepsgraphRelationBuilder::build_driver_data(ID *id, FCurve *fcu)
 				             parameters_key,
 				             "Driver Target -> Properties");
 			}
-			add_relation(driver_key, target_key, "Driver -> Target");
 		}
 	}
 }
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 59322808100..d3c9560bcb1 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -230,6 +230,10 @@ static bool pointer_to_component_node_criteria(
 		*type = DEG_NODE_TYPE_SHADING;
 		return true;
 	}
+	else if (RNA_struct_is_a(ptr->type, &RNA_ShaderNode)) {
+		*type = DEG_NODE_TYPE_SHADING;
+		return true;
+	}
 	else if (ptr->type == &RNA_Curve) {
 		*id = (ID *)ptr->id.data;
 		*type = DEG_NODE_TYPE_GEOMETRY;