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

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

(cherry picked from commit d39e416c61)
This commit is contained in:
BimDav 2022-02-11 14:35:30 +01:00 committed by Rémi Verschelde
parent 869939c09f
commit b343660dac
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/project_settings.cpp
View File

@ -531,7 +531,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) {