blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix missing viewport update when tree output is in a node 

There was already an attempt to do it, but it worked incorrect because
of wrong recursion check.
This commit is contained in:
Sergey Sharybin 2016-04-06 15:23:26 +02:00
parent e10ec6ee9a
commit 42824f4403
Notes: blender-bot 2023-02-14 08:45:09 +01:00 
Referenced by issue #48068, Cycles: Grouped material do not update in render viewport
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_node/node_relationships.c
View File

@ -39,6 +39,8 @@
#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_node.h"
#include "ED_node.h" /* own include */
@ -95,11 +97,11 @@ static bool ntree_check_nodes_connected(bNodeTree *ntree, bNode *from, bNode *to
static bool node_group_has_output_dfs(bNode *node)
{
if (node->flag & NODE_TEST) {
bNodeTree *ntree = (bNodeTree *)node->id;
if (ntree->id.tag & LIB_TAG_DOIT) {
return false;
}
node->flag |= NODE_TEST;
bNodeTree *ntree = (bNodeTree *)node->id;
ntree->id.tag |= LIB_TAG_DOIT;
for (bNode *current_node = ntree->nodes.first;
current_node != NULL;
current_node = current_node->next)
@ -120,12 +122,13 @@ static bool node_group_has_output_dfs(bNode *node)
static bool node_group_has_output(bNode *node)
{
Main *bmain = G.main;
BLI_assert(node->type == NODE_GROUP);
bNodeTree *ntree = (bNodeTree *)node->id;
if (ntree == NULL) {
return false;
}
ntreeNodeFlagSet(ntree, NODE_TEST, false);
BKE_main_id_tag_listbase(&bmain->nodetree, LIB_TAG_DOIT, false);
return node_group_has_output_dfs(node);
}