diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-19 09:58:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 09:58:06 +0200 |
| commit | 1f91c2908e7c551c20dc00d88212e0aaad44f4cf (patch) | |
| tree | 127cd16898be268b3a7379e5208c7c6a99783b99 /core | |
| parent | d4c73ea2b379835e75e02b78073547960cf03a74 (diff) | |
| parent | 5a2500f580025f474a12f0c6afd5129e23a50b14 (diff) | |
Merge pull request #9698 from GodotExplorer/pr-fix-config
Fix errors with global config names no more sorrys please
Diffstat (limited to 'core')
| -rw-r--r-- | core/global_config.cpp | 2 | ||||
| -rw-r--r-- | core/input_map.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/global_config.cpp b/core/global_config.cpp index 95f4ec5e22..76572df2a7 100644 --- a/core/global_config.cpp +++ b/core/global_config.cpp @@ -945,7 +945,7 @@ GlobalConfig::GlobalConfig() { GLOBAL_DEF("input/ui_page_down", va); input_presets.push_back("input/ui_page_down"); - //GLOBAL_DEF("display/handheld/orientation", "landscape"); + //GLOBAL_DEF("display/window/handheld/orientation", "landscape"); custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::STRING, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "landscape,portrait,reverse_landscape,reverse_portrait,sensor_landscape,sensor_portrait,sensor"); custom_prop_info["rendering/threads/thread_model"] = PropertyInfo(Variant::INT, "rendering/threads/thread_model", PROPERTY_HINT_ENUM, "Single-Unsafe,Single-Safe,Multi-Threaded"); diff --git a/core/input_map.cpp b/core/input_map.cpp index 1307c467e6..ab7fcb5b15 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -281,7 +281,7 @@ void InputMap::load_default() { key->set_scancode(KEY_PAGEDOWN); action_add_event("ui_page_down", key); - //set("display/handheld/orientation", "landscape"); + //set("display/window/handheld/orientation", "landscape"); } InputMap::InputMap() { |