From 16d38b199a2a3b4ca74bd7acab3ad426218353ff Mon Sep 17 00:00:00 2001 From: Wilhem Barbier Date: Wed, 18 May 2016 20:26:07 +0200 Subject: [PATCH] Check the save path before importing a 3D Mesh (cherry picked from commit f38473f65bd570467f485ca63af718454a70c546) --- .../io_plugins/editor_mesh_import_plugin.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp index b32ab8cb0b8..be93b5ab78e 100644 --- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp @@ -207,6 +207,13 @@ public: return; } + String dst = save_path->get_text(); + if (dst=="") { + error_dialog->set_text("Save path is empty!"); + error_dialog->popup_centered_minsize(); + return; + } + for(int i=0;i imd = memnew( ResourceImportMetadata ); @@ -224,16 +231,9 @@ public: imd->add_source(EditorImportPlugin::validate_source_path(meshes[i])); - String dst = save_path->get_text(); - if (dst=="") { - error_dialog->set_text("Save path is empty!"); - error_dialog->popup_centered_minsize(); - return; - } + String file_path = dst.plus_file(meshes[i].get_file().basename()+".msh"); - dst = dst.plus_file(meshes[i].get_file().basename()+".msh"); - - plugin->import(dst,imd); + plugin->import(file_path,imd); } hide();