diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-20 16:28:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 16:28:24 +0100 |
| commit | 5d815a5526b3db9a9f0bc474e6caa1b23358122f (patch) | |
| tree | 786693d1b0fe651e23555f9f67dfe334d358e1b7 /main | |
| parent | d39c0577c0642de94868f649916f7dbcb344cc11 (diff) | |
| parent | e7018e4017c7ce99f7f56a58e40c18b3696bdabf (diff) | |
Merge pull request #26087 from akien-mga/settings-per-pixel-transparency
ProjectSettings: fix category for per pixel transparency settings
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/main.cpp b/main/main.cpp index c504aa7e8e..b81a379dbb 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -926,13 +926,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->_allow_hidpi = GLOBAL_DEF("display/window/dpi/allow_hidpi", false); } - OS::get_singleton()->_allow_layered = GLOBAL_DEF("display/window/allow_per_pixel_transparency", false); - video_mode.use_vsync = GLOBAL_DEF("display/window/vsync/use_vsync", true); OS::get_singleton()->_use_vsync = video_mode.use_vsync; - video_mode.layered = GLOBAL_DEF("display/window/per_pixel_transparency", false); - video_mode.layered_splash = GLOBAL_DEF("display/window/per_pixel_transparency_splash", false); + OS::get_singleton()->_allow_layered = GLOBAL_DEF("display/window/per_pixel_transparency/allowed", false); + video_mode.layered = GLOBAL_DEF("display/window/per_pixel_transparency/enabled", false); + video_mode.layered_splash = GLOBAL_DEF("display/window/per_pixel_transparency/splash", false); GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation", 2); GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation.mobile", 3); |