archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #31318: cycles preview missing update for other materials using same node

Browse Source 
group with certain operations.
This commit is contained in:
Brecht Van Lommel
2012-05-05 19:44:28 +00:00
parent fef40eda72
commit c53fe94bb4
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/blender/editors/space_node/node_edit.c
View File

@@ -243,8 +243,37 @@ static bNode *editnode_get_active(bNodeTree *ntree)
return nodeGetActive(ntree);
}
void snode_dag_update(bContext *UNUSED(C), SpaceNode *snode)
static int has_nodetree(bNodeTree *ntree, bNodeTree *lookup)
{
bNode *node;
if (ntree == lookup)
return 1;
for (node=ntree->nodes.first; node; node=node->next)
if (node->type == NODE_GROUP && node->id)
if (has_nodetree((bNodeTree*)node->id, lookup))
return 1;
return 0;
}
static void snode_dag_update_group(void *calldata, ID *owner_id, bNodeTree *ntree)
{
if (has_nodetree(ntree, calldata))
DAG_id_tag_update(owner_id, 0);
}
void snode_dag_update(bContext *C, SpaceNode *snode)
{
Main *bmain = CTX_data_main(C);
/* for groups, update all ID's using this */
if (snode->edittree!=snode->nodetree) {
bNodeTreeType *tti= ntreeGetType(snode->edittree->type);
tti->foreach_nodetree(bmain, snode->edittree, snode_dag_update_group);
}
DAG_id_tag_update(snode->id, 0);
}
@@ -585,21 +614,6 @@ static void snode_update(SpaceNode *snode, bNode *node)
nodeUpdateID(snode->nodetree, gnode->id);
}
static int has_nodetree(bNodeTree *ntree, bNodeTree *lookup)
{
bNode *node;
if (ntree == lookup)
return 1;
for (node=ntree->nodes.first; node; node=node->next)
if (node->type == NODE_GROUP && node->id)
if (has_nodetree((bNodeTree*)node->id, lookup))
return 1;
return 0;
}
void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
{
int was_active_texture = (node->flag & NODE_ACTIVE_TEXTURE);