Merge pull request #39363 from MCrafterzz/fix38745

Fix 38745: Importing FBX of a non-Unicode encoded path causes Assimp throws error

Merge pull request #39363 from MCrafterzz/fix38745
46d8d601 · Rémi Verschelde · GitHub · 8da68fe9 · 29abbccc · 46d8d601
Unverified Commit 46d8d601 authored Jun 07, 2020 by Rémi Verschelde Committed by GitHub Jun 07, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

editor_scene_importer_assimp.cpp modules/assimp/editor_scene_importer_assimp.cpp +2 -1

No files found.
--- a/modules/assimp/editor_scene_importer_assimp.cpp
+++ b/modules/assimp/editor_scene_importer_assimp.cpp
@@ -145,7 +145,8 @@ Node *EditorSceneImporterAssimp::import_scene(const String &p_path, uint32_t p_f
 								 // aiProcess_EmbedTextures |
 								 //aiProcess_SplitByBoneCount |
 								 0;
-	aiScene *scene = (aiScene *)importer.ReadFile(s_path.c_str(), post_process_Steps);
+	String g_path = ProjectSettings::get_singleton()->globalize_path(p_path);
+	aiScene *scene = (aiScene *)importer.ReadFile(g_path.utf8().ptr(), post_process_Steps);

 	ERR_FAIL_COND_V_MSG(scene == nullptr, nullptr, String("Open Asset Import failed to open: ") + String(importer.GetErrorString()));