Merge remote-tracking branch 'origin/master'

2 files changed, 3 insertions, 0 deletions

diff --git a/core/os/os.cpp b/core/os/os.cpp
index 1aee6d9aa2..6910b368d3 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -548,6 +548,7 @@ OS::OS() {
 	_render_thread_mode=RENDER_THREAD_SAFE;
 	_time_scale=1.0;
 	_pixel_snap=false;
+	_allow_hidpi=true;
 	Math::seed(1234567);
 }
 
diff --git a/core/os/os.h b/core/os/os.h
index 5fd2bd6c25..76dd235d24 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -60,6 +60,7 @@ class OS {
 	int _target_fps;
 	float _time_scale;
 	bool _pixel_snap;
+	bool _allow_hidpi;
 
 	char *last_error;
 
@@ -418,6 +419,7 @@ public:
 
 	virtual void set_context(int p_context);
 
+	bool is_hidpi_allowed() const { return _allow_hidpi; }
 	OS();
 	virtual ~OS();