diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index a83594ef3bd..70d5711fdcd 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -532,7 +532,10 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append, continue; if (dist < closest_dist) { - item = edited_scene->get_deepest_editable_node(Object::cast_to(spat)); + item = Object::cast_to(spat); + if (item != edited_scene) { + item = edited_scene->get_deepest_editable_node(item); + } closest = item->get_instance_id(); closest_dist = dist; @@ -687,7 +690,10 @@ void SpatialEditorViewport::_select_region() { if (!sp || _is_node_locked(sp)) continue; - Node *item = edited_scene->get_deepest_editable_node(Object::cast_to(sp)); + Node *item = Object::cast_to(sp); + if (item != edited_scene) { + item = edited_scene->get_deepest_editable_node(item); + } // Replace the node by the group if grouped if (item->is_class("Spatial")) { diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 9ff6c45aeff..f503c6d5c7b 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -1929,7 +1929,7 @@ bool Node::is_editable_instance(const Node *p_node) const { Node *Node::get_deepest_editable_node(Node *p_start_node) const { ERR_FAIL_NULL_V(p_start_node, nullptr); - ERR_FAIL_COND_V(!is_a_parent_of(p_start_node), nullptr); + ERR_FAIL_COND_V(!is_a_parent_of(p_start_node), p_start_node); Node const *iterated_item = p_start_node; Node *node = p_start_node;