[Bf-blender-cvs] [1018683defa] master: Depsgraph: Fix wrong ID type being compared
Sergey Sharybin
noreply at git.blender.org
Thu Nov 9 10:37:55 CET 2017
Commit: 1018683defa987eb51ba28df7fc6fa4a92eda335
Author: Sergey Sharybin
Date: Wed Nov 8 17:33:46 2017 +0100
Branches: master
https://developer.blender.org/rB1018683defa987eb51ba28df7fc6fa4a92eda335
Depsgraph: Fix wrong ID type being compared
===================================================================
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 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) {
More information about the Bf-blender-cvs
mailing list