summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBimDav <67792882+BimDav@users.noreply.github.com>2022-02-11 14:35:30 +0100
committerBimDav <67792882+BimDav@users.noreply.github.com>2022-02-11 14:35:30 +0100
commitd39e416c61570addba7bd617f9208dc81f9031fb (patch)
tree0cf369f8f9414f825e7ab781ad76a922595769be
parent3aa7b7eaf2c24cc3e91d6a4155c0d6bdce88d91b (diff)
has_setting now correctly returns true when the setting is present due to a feature tag
-rw-r--r--core/config/project_settings.cpp6
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) {