griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Jacques Lucke
2024-03-11 19:18:07 +01:00
parent e0ba5b3cad bca31c3846
commit b33ec06283
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2508,14 +2508,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()) {
@@ -2529,9 +2532,6 @@ bool nodeIsDanglingReroute(const bNodeTree *ntree, const bNode *node)
return false;
}
iter_node = link.fromnode;
if (!iter_node->is_reroute()) {
return false;
}
}
}