Skip to content

Commit

Permalink
Merge pull request #87922 from ryevdokimov/all-tools-can-select-regre…
Browse files Browse the repository at this point in the history
…ssion-2

Fix a regression when multiple nodes are selected and drag transform is attempted w/o gizmo
  • Loading branch information
akien-mga committed Feb 5, 2024
2 parents 79539cb + 677bd97 commit 64cee8a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions editor/plugins/node_3d_editor_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1749,8 +1749,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
_edit.mode = TRANSFORM_NONE;
_edit.original = spatial_editor->get_gizmo_transform(); // To prevent to break when flipping with scale.

bool node_selected = spatial_editor->get_single_selected_node();
bool can_select_gizmos = node_selected;
bool can_select_gizmos = spatial_editor->get_single_selected_node();

{
int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
Expand Down Expand Up @@ -1840,6 +1839,8 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {

clicked = ObjectID();

bool node_selected = get_selected_count() > 0;

if (node_selected && ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->is_command_or_control_pressed()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE)) {
begin_transform(TRANSFORM_ROTATE, false);
break;
Expand Down

0 comments on commit 64cee8a

Please sign in to comment.