godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Merge pull request #95420 from TokisanGames/fix-crash-selecting-notdescendant

Browse Source 
Fix crash by ensuring selected node is a descendant of the edited scene
This commit is contained in:
Rémi Verschelde
2024-08-16 14:34:15 +02:00
parent 751d285f3f b1a45d9487
commit 45342d06a6
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/plugins/node_3d_editor_plugin.cpp
View File

@@ -1064,22 +1064,24 @@ void Node3DEditorViewport::_select_region() {
if (found_nodes.has(sp)) { if (found_nodes.has(sp)) {
continue; continue;
} }
found_nodes.insert(sp); found_nodes.insert(sp);
Node *node = Object::cast_to<Node>(sp); Node *node = Object::cast_to<Node>(sp);
if (node != edited_scene) {
node = edited_scene->get_deepest_editable_node(node);
}
// Prevent selection of nodes not owned by the edited scene. // Selection requires that the node is the edited scene or its descendant, and has an owner.
while (node && node != edited_scene->get_parent()) { if (node != edited_scene) {
if (!node->get_owner() || !edited_scene->is_ancestor_of(node)) {
continue;
}
node = edited_scene->get_deepest_editable_node(node);
while (node != edited_scene) {
Node *node_owner = node->get_owner(); Node *node_owner = node->get_owner();
if (node_owner == edited_scene || node == edited_scene || (node_owner != nullptr && edited_scene->is_editable_instance(node_owner))) { if (node_owner == edited_scene || (node_owner != nullptr && edited_scene->is_editable_instance(node_owner))) {
break; break;
} }
node = node->get_parent(); node = node->get_parent();
} }
}
// Replace the node by the group if grouped // Replace the node by the group if grouped
if (node->is_class("Node3D")) { if (node->is_class("Node3D")) {