blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Depsgraph: Fix wrong comparison of ID type vs. node type

This commit is contained in:
Sergey Sharybin 2016-11-03 11:19:42 +01:00
parent 534f11f71e
commit fc1b35e44c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -1171,15 +1171,17 @@ void DepsgraphNodeBuilder::build_nodetree(DepsNode *owner_node, bNodeTree *ntree
/* nodetree's nodes... */
for (bNode *bnode = (bNode *)ntree->nodes.first; bnode; bnode = bnode->next) {
if (bnode->id) {
if (GS(bnode->id->name) == ID_MA) {
build_material(owner_node, (Material *)bnode->id);
ID *id = bnode->id;
if (id != NULL) {
short id_type = GS(id->name);
if (id_type == ID_MA) {
build_material(owner_node, (Material *)id);
}
else if (bnode->type == ID_TE) {
build_texture(owner_node, (Tex *)bnode->id);
else if (id_type == ID_TE) {
build_texture(owner_node, (Tex *)id);
}
else if (bnode->type == NODE_GROUP) {
bNodeTree *group_ntree = (bNodeTree *)bnode->id;
bNodeTree *group_ntree = (bNodeTree *)id;
if ((group_ntree->id.tag & LIB_TAG_DOIT) == 0) {
build_nodetree(owner_node, group_ntree);
}