diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-02-11 15:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 15:31:12 +0100 |
| commit | ea0337909ce562e4ef0eaed1fc29c2940ebdecaf (patch) | |
| tree | 2c3290f949b66ec0f7799036d69a41010b1654cb /core | |
| parent | 36892b7fc8633d450dd54e2266147b7a5677bb97 (diff) | |
| parent | d39e416c61570addba7bd617f9208dc81f9031fb (diff) | |
Merge pull request #57972 from BimDav/fix_has_setting4
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/project_settings.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp index b5f1015ff5..887051f18f 100644 --- a/core/config/project_settings.cpp +++ b/core/config/project_settings.cpp @@ -615,7 +615,11 @@ Error ProjectSettings::setup(const String &p_path, const String &p_main_pack, bo bool ProjectSettings::has_setting(String p_var) const { _THREAD_SAFE_METHOD_ - return props.has(p_var); + StringName name = p_var; + if (!disable_feature_overrides && feature_overrides.has(name)) { + name = feature_overrides[name]; + } + return props.has(name); } Error ProjectSettings::_load_settings_binary(const String &p_path) { |