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"

This commit is contained in:
Rémi Verschelde 2022-03-07 12:33:07 +01:00 committed by GitHub
parent 6c3170e875
commit 78bf9926f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/config/project_settings.cpp
View File

@ -614,11 +614,7 @@ Error ProjectSettings::setup(const String &p_path, const String &p_main_pack, bo
bool ProjectSettings::has_setting(String p_var) const {
_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);
}
Error ProjectSettings::_load_settings_binary(const String &p_path) {