Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-01-26 18:49:24 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-26 18:49:24 +0300
commitc441eb27ea2798019a6eba6ae6ed3f7e10bff66b (patch)
tree40beee68310ac3685f5911ea93a463e5272e4626
parent331f7217258eb74c31ef766a3c2fff7d34c6511f (diff)
Depsgraph: Add relation from node tree to material it's coming from
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc14
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 67eb243f82f..82d502dcc19 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 */