blender/blender
168
526
Fork 801
Code Issues 6.6k Pull Requests 962 Projects 21 Wiki Activity

Fix: Handle cyclic links for multi-input sockets #119335

Merged
Jacques Lucke merged 2 commits from mod_moder/blender:fix_cyclic_danglicg_reroures into blender-v4.1-release 2024-03-11 19:17:37 +01:00
Conversation 1 Commits 2 Files Changed 1 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/blenkernel/intern/node.cc
View File

@ -2488,14 +2488,17 @@ bool nodeIsDanglingReroute(const bNodeTree *ntree, const bNode *node)
{
ntree->ensure_topology_cache();
BLI_assert(node_tree_runtime::topology_cache_is_available(*ntree));
BLI_assert(!ntree->has_available_link_cycle());
const bNode *iter_node = node;
if (!iter_node->is_reroute()) {
return false;
}
Set<const bNode *> visited_nodes;
while (true) {
if (!iter_node->is_reroute()) {
return false;
}
if (!visited_nodes.add(iter_node)) {
/* Treat cycle of reroute as dangling reroute branch. */
return true;
}
const Span<const bNodeLink *> links = iter_node->input_socket(0).directly_linked_links();
BLI_assert(links.size() <= 1);
if (links.is_empty()) {
@ -2509,9 +2512,6 @@ bool nodeIsDanglingReroute(const bNodeTree *ntree, const bNode *node)
return false;
}
iter_node = link.fromnode;
if (!iter_node->is_reroute()) {
return false;
}
}
}