From 99bc7f3f4e6f46bd3d00c0adcb63217c5f53d727 Mon Sep 17 00:00:00 2001 From: volzhs Date: Thu, 10 May 2018 14:26:28 +0900 Subject: [PATCH] Fix setting for pointing emulation Fix #18582 GLOBAL_DEF("input/something") is treated as Input Map setting, not as General. --- main/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index 1c5540fd197..9c8474cb5be 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1150,14 +1150,14 @@ Error Main::setup2(Thread::ID p_main_tid_override) { InputDefault *id = Object::cast_to(Input::get_singleton()); if (id) { - if (bool(GLOBAL_DEF("input/pointing_devices/emulate_touch_from_mouse", false)) && !(editor || project_manager)) { + if (bool(GLOBAL_DEF("input_devices/pointing/emulate_touch_from_mouse", false)) && !(editor || project_manager)) { if (!OS::get_singleton()->has_touchscreen_ui_hint()) { //only if no touchscreen ui hint, set emulation id->set_emulate_touch_from_mouse(true); } } - id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF("input/pointing_devices/emulate_mouse_from_touch", true))); + id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF("input_devices/pointing/emulate_mouse_from_touch", true))); } MAIN_PRINT("Main: Load Remaps");