diff options
author | Jacques Lucke <jacques@blender.org> | 2021-11-19 12:16:30 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-11-19 12:16:30 +0300 |
commit | eb071c9ff4e69b3b721a91bed3f0bf758fbe6c0e (patch) | |
tree | f801bdf107fcc60458c57722e74cf0fd6d7c3859 /source/blender/nodes/intern | |
parent | 48e64a5fb5d0d9f31e7eb95a5d2e8163d96183fa (diff) | |
parent | de3fda29c79f143d0bc251ded5bcbf4613417247 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r-- | source/blender/nodes/intern/derived_node_tree.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/derived_node_tree.cc b/source/blender/nodes/intern/derived_node_tree.cc index 14d6c77299b..8a9386c1137 100644 --- a/source/blender/nodes/intern/derived_node_tree.cc +++ b/source/blender/nodes/intern/derived_node_tree.cc @@ -167,7 +167,11 @@ DInputSocket DOutputSocket::get_active_corresponding_group_output_socket() const BLI_assert(socket_ref_->node().is_group_node()); const DTreeContext *child_context = context_->child_context(socket_ref_->node()); - BLI_assert(child_context != nullptr); + if (child_context == nullptr) { + /* Can happen when the group node references a non-existant group (e.g. when the group is + * linked but the original file is not found). */ + return {}; + } const NodeTreeRef &child_tree = child_context->tree(); Span<const NodeRef *> group_output_nodes = child_tree.nodes_by_type("NodeGroupOutput"); |