From fd21478f435d119ac0e40b25eb13e2eb6de7f851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 7 Mar 2022 12:33:07 +0100 Subject: [PATCH] Revert "Fix ProjectSettings has_setting() when used on a overriden setting with feature tags" (cherry picked from commit 78bf9926f80387a619e323f283ce1b57350de980) --- core/project_settings.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/project_settings.cpp b/core/project_settings.cpp index b5dfe61dc06..4b8c644a937 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -509,11 +509,7 @@ Error ProjectSettings::setup(const String &p_path, const String &p_main_pack, bo bool ProjectSettings::has_setting(String p_var) const { _THREAD_SAFE_METHOD_ - StringName name = p_var; - if (!disable_feature_overrides && feature_overrides.has(name)) { - name = feature_overrides[name]; - } - return props.has(name); + return props.has(p_var); } void ProjectSettings::set_registering_order(bool p_enable) {