diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-07 15:43:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-07 15:43:09 +0200 |
| commit | 46d8d6018685c018753c5ce5638eebf303bc5544 (patch) | |
| tree | 981476507a1db2af37994f695f882608c0f969e3 | |
| parent | 8da68fe9107a16ab372e42c9358680867de1388f (diff) | |
| parent | 29abbccc5f96a53ef74dc9154b60ecc043c33d74 (diff) | |
Merge pull request #39363 from MCrafterzz/fix38745
Fix 38745: Importing FBX of a non-Unicode encoded path causes Assimp throws error
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index 9c90faf66b..fed54a76b7 100644 --- 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())); |