diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-12-16 17:28:05 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 17:28:05 -0300 |
| commit | 9c39b51c5306333ba210c0a323f4198a258b51bd (patch) | |
| tree | 0b4a378b86c7a3d6e20534e99460e05384ace298 /editor | |
| parent | c514cc58224e5c973ac8be7bb6db7023d5c25906 (diff) | |
| parent | bf77016c8a3cc9a8ff4c57c0fc32a4255006391b (diff) | |
Merge pull request #44430 from reduz/reimplement-skeletons-blendshapes
Reimplement skeletons and blend shapes
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_file_system.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 43f0c9e2bb..a8a7262cf0 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -1586,7 +1586,7 @@ Error EditorFileSystem::_reimport_group(const String &p_group_file, const Vector f->store_line("importer=\"" + importer->get_importer_name() + "\""); int version = importer->get_format_version(); if (version > 0) { - f->store_line("importer_version=" + itos(importer->get_format_version())); + f->store_line("importer_version=" + itos(version)); } if (importer->get_resource_type() != "") { f->store_line("type=\"" + importer->get_resource_type() + "\""); @@ -1725,7 +1725,7 @@ void EditorFileSystem::_reimport_file(const String &p_file) { importer = ResourceFormatImporter::get_singleton()->get_importer_by_extension(p_file.get_extension()); load_default = true; if (importer.is_null()) { - ERR_PRINT("BUG: File queued for import, but can't be imported!"); + ERR_PRINT("BUG: File queued for import, but can't be imported, importer for type '" + importer_name + "' not found."); ERR_FAIL(); } } @@ -1772,6 +1772,10 @@ void EditorFileSystem::_reimport_file(const String &p_file) { f->store_line("[remap]"); f->store_line(""); f->store_line("importer=\"" + importer->get_importer_name() + "\""); + int version = importer->get_format_version(); + if (version > 0) { + f->store_line("importer_version=" + itos(version)); + } if (importer->get_resource_type() != "") { f->store_line("type=\"" + importer->get_resource_type() + "\""); } |