godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-01 16:38:31 +00:00
Code Releases Wiki Activity

Merge pull request #20240 from matthew1006/has-custom-feature-tag-fix

Browse Source 
Fixed OS.has_feature not using custom feature tags.
This commit is contained in:
Rémi Verschelde
2018-07-18 12:36:09 +02:00
committed by GitHub
parent bd9b8098fe 25e64ffa20
commit d603a74c53
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/os/os.cpp
View File

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

4
core/project_settings.cpp
View File

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

2
core/project_settings.h
View File

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