[Bf-blender-cvs] [c441eb27ea] master: Depsgraph: Add relation from node tree to material it's coming from

[Sergey Sharybin]

Commit: c441eb27ea2798019a6eba6ae6ed3f7e10bff66b
Author: Sergey Sharybin
Date:   Thu Jan 26 16:49:24 2017 +0100
Branches: master
https://developer.blender.org/rBc441eb27ea2798019a6eba6ae6ed3f7e10bff66b

Depsgraph: Add relation from node tree to material it's coming from

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

M	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 67eb243f82..82d502dcc1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1654,7 +1654,19 @@ void DepsgraphRelationBuilder::build_material(Material *ma)
 	build_texture_stack(ma->mtex);
 
 	/* material's nodetree */
-	build_nodetree(ma->nodetree);
+	if (ma->nodetree != NULL) {
+		build_nodetree(ma->nodetree);
+		OperationKey ntree_key(&ma->nodetree->id,
+		                       DEPSNODE_TYPE_PARAMETERS,
+		                       DEG_OPCODE_PLACEHOLDER,
+		                       "Parameters Eval");
+		OperationKey material_key(&ma->id,
+		                          DEPSNODE_TYPE_SHADING,
+		                          DEG_OPCODE_PLACEHOLDER,
+		                          "Material Update");
+		add_relation(ntree_key, material_key,
+		             DEPSREL_TYPE_UPDATE, "Material's NTree");
+	}
 }
 
 /* Recursively build graph for texture */