diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-17 23:14:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 23:14:58 +0200 |
| commit | 23f4e7990f92b33a3e6597e0b1ce5ef6785f975d (patch) | |
| tree | 0ce21a0bbb8e2c14690c1eba894fc6464b4de74a | |
| parent | c5b70ac445d3e31336ba0047c31aa40047df8e14 (diff) | |
| parent | e7fd9adb4c122e2764be31b866e3a7bfea64e421 (diff) | |
Merge pull request #52458 from jmb462/fix-node-pivot-shortcut-always-active
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index f11e51960c..db5be94fd2 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1295,7 +1295,7 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref<InputEvent> &p_event) { // Drag the pivot (in pivot mode / with V key) if (drag_type == DRAG_NONE) { if ((b.is_valid() && b->is_pressed() && b->get_button_index() == MOUSE_BUTTON_LEFT && tool == TOOL_EDIT_PIVOT) || - (k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_keycode() == KEY_V)) { + (k.is_valid() && k->is_pressed() && !k->is_echo() && k->get_keycode() == KEY_V && tool == TOOL_SELECT && k->get_modifiers_mask() == 0)) { List<CanvasItem *> selection = _get_edited_canvas_items(); // Filters the selection with nodes that allow setting the pivot |