From 1d77e2f10f00f64d2b87c2c416bdb98cafd1a07a Mon Sep 17 00:00:00 2001 From: Michael Alexsander Date: Tue, 17 Mar 2026 13:22:14 -0300 Subject: [PATCH] Fix 3D viewport selection getting stuck when editing a `GridMap` --- modules/gridmap/editor/grid_map_editor_plugin.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gridmap/editor/grid_map_editor_plugin.cpp b/modules/gridmap/editor/grid_map_editor_plugin.cpp index 6f7944d844..75bdb77424 100644 --- a/modules/gridmap/editor/grid_map_editor_plugin.cpp +++ b/modules/gridmap/editor/grid_map_editor_plugin.cpp @@ -894,7 +894,7 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D floor->set_value(floor->get_value() + mb->get_factor()); } - return EditorPlugin::AFTER_GUI_INPUT_STOP; // Eaten. + return EditorPlugin::AFTER_GUI_INPUT_STOP; } else if (mb->get_button_index() == MouseButton::WHEEL_DOWN && (mb->is_command_or_control_pressed())) { if (mb->is_pressed()) { floor->set_value(floor->get_value() - mb->get_factor()); @@ -940,14 +940,14 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D } return EditorPlugin::AFTER_GUI_INPUT_STOP; } + + return EditorPlugin::AFTER_GUI_INPUT_PASS; // Allow freelook to be enabled. } else { return EditorPlugin::AFTER_GUI_INPUT_PASS; } - if (do_input_action(p_camera, Point2(mb->get_position().x, mb->get_position().y), true)) { - return EditorPlugin::AFTER_GUI_INPUT_STOP; - } - return EditorPlugin::AFTER_GUI_INPUT_PASS; + do_input_action(p_camera, Point2(mb->get_position().x, mb->get_position().y), true); + return EditorPlugin::AFTER_GUI_INPUT_STOP; } else { if ((mb->get_button_index() == MouseButton::LEFT && input_action == INPUT_ERASE) || (mb->get_button_index() == MouseButton::LEFT && input_action == INPUT_PAINT)) { if (set_items.size()) {