summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2023-01-13 13:16:49 +0100
committerJuan Linietsky <reduzio@gmail.com>2023-01-13 15:13:56 +0100
commit6f0e210093dbd3f20bec34a4e60861dcceabd484 (patch)
tree608560e2f51e2b5a26542268a625266b2cdf62de /main
parent3c9bf4bc210a8e6a208f30ca59de4d4d7e18c04d (diff)
Refactor ProjectSetting overrides
* Overrides no longer happen for set/get. * They must be checked with a new function: `ProjectSettings::get_setting_with_override()`. * GLOBAL_DEF/GLOBAL_GET updated to use this This change solves many problems: * General confusion about getting the actual or overriden setting. * Feature tags available after settings are loaded were being ignored, they are now considered. * Hacks required for the Project Settings editor to work. Fixes #64100. Fixes #64014. Fixes #61908.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index e38669f161..7ba5ffab2a 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1385,7 +1385,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
#ifdef TOOLS_ENABLED
if (editor) {
packed_data->set_disabled(true);
- globals->set_disable_feature_overrides(true);
Engine::get_singleton()->set_editor_hint(true);
main_args.push_back("--editor");
if (!init_windowed) {