Skip to content

Commit

Permalink
Merge pull request godotengine#95420 from TokisanGames/fix-crash-sele…
Browse files Browse the repository at this point in the history
…cting-notdescendant

Fix crash by ensuring selected node is a descendant of the edited scene
  • Loading branch information
akien-mga authored and Ryan-000 committed Nov 11, 2024
1 parent d9d23c2 commit 3fac36a
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions editor/plugins/node_3d_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1064,21 +1064,23 @@ void Node3DEditorViewport::_select_region() {
if (found_nodes.has(sp)) {
continue;
}

found_nodes.insert(sp);

Node *node = Object::cast_to<Node>(sp);

// Selection requires that the node is the edited scene or its descendant, and has an owner.
if (node != edited_scene) {
if (!node->get_owner() || !edited_scene->is_ancestor_of(node)) {
continue;
}
node = edited_scene->get_deepest_editable_node(node);
}

// Prevent selection of nodes not owned by the edited scene.
while (node && node != edited_scene->get_parent()) {
Node *node_owner = node->get_owner();
if (node_owner == edited_scene || node == edited_scene || (node_owner != nullptr && edited_scene->is_editable_instance(node_owner))) {
break;
while (node != edited_scene) {
Node *node_owner = node->get_owner();
if (node_owner == edited_scene || (node_owner != nullptr && edited_scene->is_editable_instance(node_owner))) {
break;
}
node = node->get_parent();
}
node = node->get_parent();
}

// Replace the node by the group if grouped
Expand Down

0 comments on commit 3fac36a

Please sign in to comment.