diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-29 12:28:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-29 12:28:30 +0200 |
| commit | 52355c638b03ff9316ee3f39e32ac968252489d3 (patch) | |
| tree | cabf1815270f0b415c3640e680ef40535793dae5 /editor/editor_settings.cpp | |
| parent | e222e31fe633f6b4ae0abbc3cb2fb6a80ad2f9cd (diff) | |
| parent | 0c4c36d823bb6792917dfac86491f61cec3f9b27 (diff) | |
Merge pull request #29380 from bojidar-bg/16086-docs-default-value
Add default values to the editor help, docs, and generated RST
Diffstat (limited to 'editor/editor_settings.cpp')
| -rw-r--r-- | editor/editor_settings.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 8521c0c723..a36163f661 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -1473,6 +1473,10 @@ void EditorSettings::get_shortcut_list(List<String> *r_shortcuts) { Ref<ShortCut> ED_GET_SHORTCUT(const String &p_path) { + if (!EditorSettings::get_singleton()) { + return NULL; + } + Ref<ShortCut> sc = EditorSettings::get_singleton()->get_shortcut(p_path); if (!sc.is_valid()) { ERR_EXPLAIN("Used ED_GET_SHORTCUT with invalid shortcut: " + p_path); @@ -1508,6 +1512,15 @@ Ref<ShortCut> ED_SHORTCUT(const String &p_path, const String &p_name, uint32_t p ie->set_metakey(bool(p_keycode & KEY_MASK_META)); } + if (!EditorSettings::get_singleton()) { + Ref<ShortCut> sc; + sc.instance(); + sc->set_name(p_name); + sc->set_shortcut(ie); + sc->set_meta("original", ie); + return sc; + } + Ref<ShortCut> sc = EditorSettings::get_singleton()->get_shortcut(p_path); if (sc.is_valid()) { |