summaryrefslogtreecommitdiff
path: root/editor/plugins
diff options
context:
space:
mode:
authorjmb462 <jmb462@gmail.com>2021-09-07 13:16:24 +0200
committerjmb462 <jmb462@gmail.com>2021-09-07 14:02:27 +0200
commite7fd9adb4c122e2764be31b866e3a7bfea64e421 (patch)
tree3024d9d508e203e476088ab13de26b1410c6f91e /editor/plugins
parent88c3e3180a52b2460429dfc031555392394fd97d (diff)
Fix node pivot shortcut is always active
Diffstat (limited to 'editor/plugins')
-rw-r--r--editor/plugins/canvas_item_editor_plugin.cpp2
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 d96cc1cd18..1bbca66c73 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