Merge pull request #84831 from EelisOtsamo/editor_3d_click_select_skip_locked

Ignore locked nodes when click selecting in 3d editor

1 files changed, 8 insertions, 3 deletions

diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index 22300fe851..6850a79ce6 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -1918,12 +1918,17 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					}
 
 					if (after != EditorPlugin::AFTER_GUI_INPUT_CUSTOM) {
-						//clicking is always deferred to either move or release
-						clicked = _select_ray(b->get_position());
+						// Single item selection.
+						Vector<_RayResult> selection;
+						_find_items_at_pos(b->get_position(), selection, false);
+						if (!selection.is_empty()) {
+							clicked = selection[0].item->get_instance_id();
+						}
+
 						selection_in_progress = true;
 
 						if (clicked.is_null()) {
-							//default to regionselect
+							// Default to region select.
 							cursor.region_select = true;
 							cursor.region_begin = b->get_position();
 							cursor.region_end = b->get_position();