diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-01 15:01:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 15:01:43 +0200 |
| commit | 316b60aa68bc348b8d6ab125ee2fb7cd3793cb49 (patch) | |
| tree | ec68558ac20721509deb53f2743b5517f96da428 | |
| parent | b77f0e83ca9251ef64c61d865930e15f8cbdafbe (diff) | |
| parent | 03c3abae8802b01e85f8fa7032ef199a637c44bf (diff) | |
Merge pull request #38380 from dreamsComeTrue/soft-reload-scripts-shortcut
Fix Soft Reload Script shortcut clash with Replace in Files
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 35a08f2d1c..e6d3f17f12 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -3190,7 +3190,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/save_as", TTR("Save As...")), FILE_SAVE_AS); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/save_all", TTR("Save All"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_MASK_ALT | KEY_S), FILE_SAVE_ALL); file_menu->get_popup()->add_separator(); - file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/reload_script_soft", TTR("Soft Reload Script"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_R), FILE_TOOL_RELOAD_SOFT); + file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/reload_script_soft", TTR("Soft Reload Script"), KEY_MASK_CMD | KEY_MASK_ALT | KEY_R), FILE_TOOL_RELOAD_SOFT); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/copy_path", TTR("Copy Script Path")), FILE_COPY_PATH); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/show_in_file_system", TTR("Show in FileSystem")), SHOW_IN_FILE_SYSTEM); file_menu->get_popup()->add_separator(); |