Browse Source

Revert "Fix ProjectSettings has_setting() when used on a overriden setting with feature tags"

(cherry picked from commit 78bf9926f80387a619e323f283ce1b57350de980)
Rémi Verschelde 3 years ago
parent
commit
fd21478f43
1 changed files with 1 additions and 5 deletions
  1. 1 5
      core/project_settings.cpp

+ 1 - 5
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 {
 bool ProjectSettings::has_setting(String p_var) const {
 	_THREAD_SAFE_METHOD_
 	_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) {
 void ProjectSettings::set_registering_order(bool p_enable) {