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-11-08 19:33:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-09 12:33:44 +0300
commit1018683defa987eb51ba28df7fc6fa4a92eda335 (patch)
tree0e9ab55248139f7fe98393ffda32194574c8e0ed
parent98425563ed33b95648eee511f783e866c92a1cae (diff)
Depsgraph: Fix wrong ID type being compared
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 4a6e0765069..dcae17eebd7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1722,10 +1722,11 @@ void DepsgraphRelationBuilder::build_nodetree(bNodeTree *ntree)
if (id == NULL) {
continue;
}
- if (GS(id->name) == ID_MA) {
+ ID_Type id_type = GS(id->name);
+ if (id_type == ID_MA) {
build_material((Material *)bnode->id);
}
- else if (bnode->type == ID_TE) {
+ else if (id_type == ID_TE) {
build_texture((Tex *)bnode->id);
}
else if (bnode->type == NODE_GROUP) {