summaryrefslogtreecommitdiff
path: root/editor/io_plugins
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2017-06-16 15:42:18 -0300
committerGeorge Marques <george@gmarqu.es>2017-06-16 15:42:18 -0300
commit7966ebe6fa57e8ff5a855fe7010ae93594f1b9ee (patch)
tree3a5840123168c59cef5d0c97cdf66932c7decc5e /editor/io_plugins
parentbd33fd0435b2d0dc97a7abb3e68b594185f4e6c3 (diff)
Complete changing of resource extensions
Some places were missing in e42d59f.
Diffstat (limited to 'editor/io_plugins')
-rw-r--r--editor/io_plugins/editor_mesh_import_plugin.cpp2
-rw-r--r--editor/io_plugins/editor_sample_import_plugin.cpp6
-rw-r--r--editor/io_plugins/editor_texture_import_plugin.cpp6
-rw-r--r--editor/io_plugins/editor_translation_import_plugin.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/editor/io_plugins/editor_mesh_import_plugin.cpp b/editor/io_plugins/editor_mesh_import_plugin.cpp
index a8ecc2f10e..0c9f3a3f37 100644
--- a/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -262,7 +262,7 @@ public:
imd->add_source(EditorImportPlugin::validate_source_path(meshes[i]));
- String file_path = dst.plus_file(meshes[i].get_file().get_basename()+".msh");
+ String file_path = dst.plus_file(meshes[i].get_file().get_basename()+".mesh");
plugin->import(file_path,imd);
}
diff --git a/editor/io_plugins/editor_sample_import_plugin.cpp b/editor/io_plugins/editor_sample_import_plugin.cpp
index 7836b60fde..0909b96cdc 100644
--- a/editor/io_plugins/editor_sample_import_plugin.cpp
+++ b/editor/io_plugins/editor_sample_import_plugin.cpp
@@ -299,7 +299,7 @@ public:
error_dialog->popup_centered(Size2(200,100)*EDSCALE);
}
- dst = dst.plus_file(samples[i].get_file().get_basename()+".smp");
+ dst = dst.plus_file(samples[i].get_file().get_basename()+".sample");
plugin->import(dst,imd);
}
@@ -910,13 +910,13 @@ Vector<uint8_t> EditorSampleExportPlugin::custom_export(String& p_path,const Ref
imd->set_option("edit/loop",false);
imd->set_option("compress/mode",1);
- String savepath = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/smpconv.smp");
+ String savepath = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/smpconv.sample");
Error err = EditorSampleImportPlugin::singleton->import(savepath,imd);
ERR_FAIL_COND_V(err!=OK,Vector<uint8_t>());
- p_path=p_path.get_basename()+".converted.smp";
+ p_path=p_path.get_basename()+".converted.sample";
return FileAccess::get_file_as_array(savepath);
}
diff --git a/editor/io_plugins/editor_texture_import_plugin.cpp b/editor/io_plugins/editor_texture_import_plugin.cpp
index 5a5a71b6af..d48675fa30 100644
--- a/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -1097,7 +1097,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
int cell_size=from->get_option("large_cell_size");
ERR_FAIL_COND_V(cell_size<128 || cell_size>16384,ERR_CANT_OPEN);
- EditorProgress pg("ltex",TTR("Import Large Texture"),3);
+ EditorProgress pg("largetex",TTR("Import Large Texture"),3);
pg.step(TTR("Load Source Image"),0);
Image img;
@@ -1317,9 +1317,9 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
String spath = from->get_source_path(E->get()).get_file();
if (p_external) {
- apath = p_path.get_base_dir().plus_file(spath.get_basename()+"."+from->get_source_path(E->get()).md5_text()+".atex");
+ apath = p_path.get_base_dir().plus_file(spath.get_basename()+"."+from->get_source_path(E->get()).md5_text()+".atlastex");
} else {
- apath = p_path.get_base_dir().plus_file(spath.get_basename()+".atex");
+ apath = p_path.get_base_dir().plus_file(spath.get_basename()+".atlastex");
}
Ref<AtlasTexture> at;
diff --git a/editor/io_plugins/editor_translation_import_plugin.cpp b/editor/io_plugins/editor_translation_import_plugin.cpp
index caa0659046..5b15b94006 100644
--- a/editor/io_plugins/editor_translation_import_plugin.cpp
+++ b/editor/io_plugins/editor_translation_import_plugin.cpp
@@ -258,7 +258,7 @@ public:
imd->set_option("skip_first",ignore_first->is_pressed());
imd->set_option("compress",compress->is_pressed());
- String savefile = save_path->get_text().plus_file(import_path->get_text().get_file().get_basename()+"."+locale+".xl");
+ String savefile = save_path->get_text().plus_file(import_path->get_text().get_file().get_basename()+"."+locale+".translation");
Error err = plugin->import(savefile,imd);
if (err!=OK) {
error_dialog->set_text(TTR("Couldn't import!"));