Merge pull request #52458 from jmb462/fix-node-pivot-shortcut-always-…

…active
godotengine · Sep 17, 2021 · 23f4e79 · 23f4e79
2 parents c5b70ac + e7fd9ad
commit 23f4e79
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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