diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-03 15:47:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-03 15:47:48 +0200 |
| commit | 74369229de7f43ce4a0e0a102e5b3bf3c6e3a33a (patch) | |
| tree | a4810bb8f431a1049e2c0aaffd6b0282c2741840 | |
| parent | beefe98974c0400b38939f5c17e70c3ad7f2bb31 (diff) | |
| parent | 7c52824504718d04b1b6dd63a83f7ef09159fde8 (diff) | |
Merge pull request #19634 from guilhermefelipecgs/fix_shortcut_conflict
Remove shortcut conflict
| -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 0f46f7f004..7c4cd6cb3d 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -4351,7 +4351,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { snap_button->set_toggle_mode(true); snap_button->connect("toggled", this, "_button_toggle_snap"); snap_button->set_tooltip(TTR("Toggle snapping.")); - snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap"), KEY_S)); + snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_snap", TTR("Use Snap"), KEY_MASK_SHIFT | KEY_S)); snap_config_menu = memnew(MenuButton); hb->add_child(snap_config_menu); |