diff options
| author | Kostadin Damyanov | 2015-09-05 12:03:17 +0300 |
|---|---|---|
| committer | Kostadin Damyanov | 2015-09-05 12:03:17 +0300 |
| commit | c5f574b914b3cb11d97ae616df4a0bced45bb17c (patch) | |
| tree | d7b70f0842c00c480ce10039b873a1dddd894a6c /core/os/os.cpp | |
| parent | 2a757a6ad4ef4e7767b7d3ef7e177ec6613ef6d1 (diff) | |
| parent | b0aa49accbd7e45dae38f1bd43b0fbdd11714211 (diff) | |
| download | godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.tar.gz godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.tar.zst godot-c5f574b914b3cb11d97ae616df4a0bced45bb17c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'core/os/os.cpp')
| -rw-r--r-- | core/os/os.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index efcd49223..2db926e55 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -31,7 +31,7 @@ #include <stdarg.h> #include "dir_access.h" #include "globals.h" - +#include "input.h" OS* OS::singleton=NULL; @@ -363,7 +363,7 @@ Error OS::set_cwd(const String& p_cwd) { bool OS::has_touchscreen_ui_hint() const { //return false; - return GLOBAL_DEF("display/emulate_touchscreen",false); + return Input::get_singleton() && Input::get_singleton()->is_emulating_touchscreen(); } int OS::get_free_static_memory() const { |