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

Fix missing viewport update when tree output is in a node

Browse Source 
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
1 changed files with 7 additions and 4 deletions
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_context.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_node.h" #include "BKE_node.h"
#include "ED_node.h" /* own include */ #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) 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; return false;
} }
node->flag |= NODE_TEST; ntree->id.tag |= LIB_TAG_DOIT;
bNodeTree *ntree = (bNodeTree *)node->id;
for (bNode *current_node = ntree->nodes.first; for (bNode *current_node = ntree->nodes.first;
current_node != NULL; current_node != NULL;
current_node = current_node->next) 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) static bool node_group_has_output(bNode *node)
{ {
Main *bmain = G.main;
BLI_assert(node->type == NODE_GROUP); BLI_assert(node->type == NODE_GROUP);
bNodeTree *ntree = (bNodeTree *)node->id; bNodeTree *ntree = (bNodeTree *)node->id;
if (ntree == NULL) { if (ntree == NULL) {
return false; 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); return node_group_has_output_dfs(node);
} }