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

Fixed OS.has_feature not using custom feature tags. 

(cherry picked from commit 25e64ffa20)
This commit is contained in:
matthew1006 2018-07-18 09:22:59 +01:00 committed by Rémi Verschelde
parent fd5dca2689
commit c68a465f47
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/os/os.cpp
View File

@ -613,6 +613,9 @@ bool OS::has_feature(const String &p_feature) {
if (_check_internal_feature_support(p_feature)) if (_check_internal_feature_support(p_feature))
return true; return true;
if (ProjectSettings::get_singleton()->has_custom_feature(p_feature))
return true;
return false; return false;
} }

4
core/project_settings.cpp
View File

@ -886,6 +886,10 @@ Variant ProjectSettings::get_setting(const String &p_setting) const {
return get(p_setting); return get(p_setting);
} }
bool ProjectSettings::has_custom_feature(const String &p_feature) const {
return custom_features.has(p_feature);
}
void ProjectSettings::_bind_methods() { void ProjectSettings::_bind_methods() {
ClassDB::bind_method(D_METHOD("has_setting", "name"), &ProjectSettings::has_setting); ClassDB::bind_method(D_METHOD("has_setting", "name"), &ProjectSettings::has_setting);

2
core/project_settings.h
View File

@ -148,6 +148,8 @@ public:
void set_registering_order(bool p_enable); void set_registering_order(bool p_enable);
bool has_custom_feature(const String &p_feature) const;
ProjectSettings(); ProjectSettings();
~ProjectSettings(); ~ProjectSettings();
}; };