diff options
| author | reduz <juan@okamstudio.com> | 2015-10-16 19:13:09 -0300 |
|---|---|---|
| committer | reduz <juan@okamstudio.com> | 2015-10-16 19:13:09 -0300 |
| commit | 17a90ddc0824bb51b5ea707f5d4d11aed301f91d (patch) | |
| tree | f17a5e3c66e1aaee0cabe2f16d16611b97bda6cb /main/main.cpp | |
| parent | 078a474135b47adb3cbdf414c737b77ee17fe596 (diff) | |
| parent | 79e5ced7e668fa53567ac6aaf5a26393cea6c9a2 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
scene/resources/packed_scene.h
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index 84f7c3a88e..e1bc3b9fd9 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -701,6 +701,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas GLOBAL_DEF("display/resizable",video_mode.resizable); GLOBAL_DEF("display/test_width",0); GLOBAL_DEF("display/test_height",0); + OS::get_singleton()->_pixel_snap=GLOBAL_DEF("display/use_2d_pixel_snap",false); if (rtm==-1) { rtm=GLOBAL_DEF("render/thread_model",OS::RENDER_THREAD_SAFE); if (rtm>=1) //hack for now |