From d39e416c61570addba7bd617f9208dc81f9031fb Mon Sep 17 00:00:00 2001
From: BimDav <67792882+BimDav@users.noreply.github.com>
Date: Fri, 11 Feb 2022 14:35:30 +0100
Subject: [PATCH] has_setting now correctly returns true when the setting is
 present due to a feature tag

---
 core/config/project_settings.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
index b5f1015ff53..887051f18f1 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) {