diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-09-20 14:21:03 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-09-20 14:21:16 +0300 |
| commit | 2b4cb893e7ebb33c24c7413ba0ff10eeb78bddfe (patch) | |
| tree | 54ad42003882414a851a4dcbdae1bce366ac4304 /source/blender/blenkernel/intern/node_tree_update.cc | |
| parent | 22efaa2e7be9a605d6b1b043041dcbe4cb0bc969 (diff) | |
Fix T101214: hidden link can cause cycle in node tree
Links that are linked to unavailable sockets should be ignored.
Diffstat (limited to 'source/blender/blenkernel/intern/node_tree_update.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/node_tree_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/node_tree_update.cc b/source/blender/blenkernel/intern/node_tree_update.cc index dcb6666317f..f9bab0959c9 100644 --- a/source/blender/blenkernel/intern/node_tree_update.cc +++ b/source/blender/blenkernel/intern/node_tree_update.cc @@ -1388,7 +1388,7 @@ class NodeTreeMainUpdater { uint32_t get_combined_socket_topology_hash(const bNodeTree &tree, Span<const bNodeSocket *> sockets) { - if (tree.has_link_cycle()) { + if (tree.has_available_link_cycle()) { /* Return dummy value when the link has any cycles. The algorithm below could be improved to * handle cycles more gracefully. */ return 0; @@ -1404,7 +1404,7 @@ class NodeTreeMainUpdater { Array<uint32_t> get_socket_topology_hashes(const bNodeTree &tree, Span<const bNodeSocket *> sockets) { - BLI_assert(!tree.has_link_cycle()); + BLI_assert(!tree.has_available_link_cycle()); Array<std::optional<uint32_t>> hash_by_socket_id(tree.all_sockets().size()); Stack<const bNodeSocket *> sockets_to_check = sockets; |