diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-03-07 12:33:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 12:33:07 +0100 |
| commit | 78bf9926f80387a619e323f283ce1b57350de980 (patch) | |
| tree | d8dc2c78ba264bf204f8cb3f019e8a69150020bc /core | |
| parent | 6c3170e875bcb2606f08cde731f8b800801ef751 (diff) | |
Revert "Fix ProjectSettings has_setting() when used on a overriden setting with feature tags"
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/project_settings.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index c9b615fb0a..9db43afba1 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -614,11 +614,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); } Error ProjectSettings::_load_settings_binary(const String &p_path) { |