godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

[macOS] Add support for loading shell environment from UI apps.

Browse Source
This commit is contained in:
bruvzg
2023-09-03 11:44:18 +03:00
committed by Pāvels Nadtočajevs
parent e45cc68092
commit ee181951b6
5 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/main.cpp
View File

@@ -1037,6 +1037,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
Vector<String> breakpoints;
bool delta_smoothing_override = false;
bool load_shell_env = false;
String default_renderer = "";
String default_renderer_mobile = "";
@@ -2642,12 +2643,18 @@ 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", true);
OS::get_singleton()->_allow_layered = GLOBAL_DEF_RST("display/window/per_pixel_transparency/allowed", false);
load_shell_env = GLOBAL_DEF("application/run/load_shell_environment", false);
#ifdef TOOLS_ENABLED
if (editor || project_manager) {
// The editor and project manager always detect and use hiDPI if needed.
OS::get_singleton()->_allow_hidpi = true;
load_shell_env = true;
}
#endif
if (load_shell_env) {
OS::get_singleton()->load_shell_environment();
}
if (separate_thread_render == -1) {
separate_thread_render = (int)GLOBAL_DEF("rendering/driver/threads/thread_model", OS::RENDER_THREAD_SAFE) == OS::RENDER_SEPARATE_THREAD;