godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 78bf9926f8)
This commit is contained in:
Rémi Verschelde 2022-03-07 12:33:07 +01:00
parent cb66b672d7
commit fd21478f43
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/project_settings.cpp
View File

@ -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; return props.has(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) { void ProjectSettings::set_registering_order(bool p_enable) {