From bb2341e813a14f8e4c272765c4db9584b6c5c9b1 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 5 Jan 2018 17:29:55 -0300 Subject: [PATCH] Make sure .import folder exists before importing, in case user deleted it manually. Fixes #15315 --- editor/editor_file_system.cpp | 13 +++++++++++++ editor/import/resource_importer_wav.cpp | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index eff2cf9ce5c..dca32d74925 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -1509,6 +1509,19 @@ void EditorFileSystem::_reimport_file(const String &p_file) { void EditorFileSystem::reimport_files(const Vector &p_files) { + { //check that .import folder exists + DirAccess *da = DirAccess::open("res://"); + if (da->change_dir(".import") != OK) { + Error err = da->make_dir(".import"); + if (err) { + memdelete(da); + ERR_EXPLAIN("Failed to create 'res://.import' folder."); + ERR_FAIL_COND(err != OK); + } + } + memdelete(da); + } + importing = true; EditorProgress pr("reimport", TTR("(Re)Importing Assets"), p_files.size()); diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index f73c7ebfd89..12aa0bb33c8 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -389,7 +389,6 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s new_data.resize((last - first + 1) * format_channels); for (int i = first * format_channels; i < (last + 1) * format_channels; i++) { new_data[i - first * format_channels] = data[i]; - setc++; } data = new_data;