asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #15438 from endragor/export-after-import

Browse source 
Perform export after import is fully complete
This commit is contained in:
Rémi Verschelde 2018-01-07 14:27:03 +01:00 committed by GitHub
commit 25e942d64f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
editor/editor_node.cpp
View file

@ -393,42 +393,6 @@ void EditorNode::_fs_changed() {
E->get()->invalidate(); E->get()->invalidate();
} }
if (export_defer.preset != "") {
Ref<EditorExportPreset> preset;
for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); ++i) {
preset = EditorExport::get_singleton()->get_export_preset(i);
if (preset->get_name() == export_defer.preset) {
break;
}
preset.unref();
}
if (preset.is_null()) {
String err = "Unknown export preset: " + export_defer.preset;
ERR_PRINT(err.utf8().get_data());
} else {
Ref<EditorExportPlatform> platform = preset->get_platform();
if (platform.is_null()) {
String err = "Preset \"" + export_defer.preset + "\" doesn't have a platform.";
ERR_PRINT(err.utf8().get_data());
} else {
// ensures export_project does not loop infinitely, because notifications may
// come during the export
export_defer.preset = "";
if (!preset->is_runnable() && (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip"))) {
if (export_defer.path.ends_with(".zip")) {
platform->save_zip(preset, export_defer.path);
} else if (export_defer.path.ends_with(".pck")) {
platform->save_pack(preset, export_defer.path);
}
} else {
platform->export_project(preset, export_defer.debug, export_defer.path, /*p_flags*/ 0);
}
}
}
get_tree()->quit();
}
{ {
//reload changed resources //reload changed resources
List<Ref<Resource> > changed; List<Ref<Resource> > changed;
@ -465,6 +429,42 @@ void EditorNode::_fs_changed() {
} }
_mark_unsaved_scenes(); _mark_unsaved_scenes();
if (export_defer.preset != "" && !EditorFileSystem::get_singleton()->is_scanning()) {
Ref<EditorExportPreset> preset;
for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); ++i) {
preset = EditorExport::get_singleton()->get_export_preset(i);
if (preset->get_name() == export_defer.preset) {
break;
}
preset.unref();
}
if (preset.is_null()) {
String err = "Unknown export preset: " + export_defer.preset;
ERR_PRINT(err.utf8().get_data());
} else {
Ref<EditorExportPlatform> platform = preset->get_platform();
if (platform.is_null()) {
String err = "Preset \"" + export_defer.preset + "\" doesn't have a platform.";
ERR_PRINT(err.utf8().get_data());
} else {
// ensures export_project does not loop infinitely, because notifications may
// come during the export
export_defer.preset = "";
if (!preset->is_runnable() && (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip"))) {
if (export_defer.path.ends_with(".zip")) {
platform->save_zip(preset, export_defer.path);
} else if (export_defer.path.ends_with(".pck")) {
platform->save_pack(preset, export_defer.path);
}
} else {
platform->export_project(preset, export_defer.debug, export_defer.path, /*p_flags*/ 0);
}
}
}
get_tree()->quit();
}
} }
void EditorNode::_resources_reimported(const Vector<String> &p_resources) { void EditorNode::_resources_reimported(const Vector<String> &p_resources) {