diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:30:08 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:30:08 -0300 |
| commit | 63033aa646f7a49fbcecbc8cc30077cf268be10c (patch) | |
| tree | 80ccf1aed83e6c4d3ed1db2e1d2c0258090f7339 /core/os/os.h | |
| parent | ab22203791489df160c36a29a3cd8aa8b32bec04 (diff) | |
| parent | 0d2b28377f1257af039c088f30c11aa0d12cc695 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/os/os.h')
| -rw-r--r-- | core/os/os.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/os/os.h b/core/os/os.h index d89734d7d3..e5338b4a02 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -58,6 +58,7 @@ class OS { float _fps; int _target_fps; float _time_scale; + bool _pixel_snap; char *last_error; @@ -393,7 +394,7 @@ public: void set_time_scale(float p_scale); float get_time_scale() const; - + _FORCE_INLINE_ bool get_use_pixel_snap() const { return _pixel_snap; } OS(); virtual ~OS(); |