summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-12-07 20:56:06 +0100
committerGitHub <noreply@github.com>2018-12-07 20:56:06 +0100
commit0611b674c19f2eb9cc6baaee25cf7c8146c643fb (patch)
tree156b3e1a3c9608e7ade8680f248b63b3f316a81d /editor
parentbb4d02e41a6c826360e8f270718cfd32b7bb1305 (diff)
parent087401b33f05b204b4d8b06606627b2fa6f2a625 (diff)
Merge pull request #24216 from marcelofg55/custom_features_fix
Fix custom features missing when _export_begin is called
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_export.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp
index 1639369214..9df0f30ca4 100644
--- a/editor/editor_export.cpp
+++ b/editor/editor_export.cpp
@@ -594,6 +594,20 @@ EditorExportPlatform::FeatureContainers EditorExportPlatform::get_feature_contai
result.features.insert(E->get());
result.features_pv.push_back(E->get());
}
+
+ if (p_preset->get_custom_features() != String()) {
+
+ Vector<String> tmp_custom_list = p_preset->get_custom_features().split(",");
+
+ for (int i = 0; i < tmp_custom_list.size(); i++) {
+ String f = tmp_custom_list[i].strip_edges();
+ if (f != String()) {
+ result.features.insert(f);
+ result.features_pv.push_back(f);
+ }
+ }
+ }
+
return result;
}