Browse Source

has_setting now correctly returns true when the setting is present due to a feature tag

(cherry picked from commit d39e416c61570addba7bd617f9208dc81f9031fb)
BimDav 3 years ago
parent
commit
e53604b742
1 changed files with 5 additions and 1 deletions
  1. 5 1
      core/project_settings.cpp

+ 5 - 1
core/project_settings.cpp

@@ -509,7 +509,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);
 }
 
 void ProjectSettings::set_registering_order(bool p_enable) {