godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fbx import assimp error 

(cherry picked from commit 29abbccc5f)
This commit is contained in:
Marcus Elg 2020-06-07 14:52:05 +02:00 committed by Rémi Verschelde
parent 221051d523
commit f1ca218ce7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/assimp/editor_scene_importer_assimp.cpp
View File

@ -147,7 +147,8 @@ Node *EditorSceneImporterAssimp::import_scene(const String &p_path, uint32_t p_f
// aiProcess_EmbedTextures | // aiProcess_EmbedTextures |
//aiProcess_SplitByBoneCount | //aiProcess_SplitByBoneCount |
0; 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 == NULL, NULL, String("Open Asset Import failed to open: ") + String(importer.GetErrorString())); ERR_FAIL_COND_V_MSG(scene == NULL, NULL, String("Open Asset Import failed to open: ") + String(importer.GetErrorString()));