summaryrefslogtreecommitdiff
path: root/modules/assimp
diff options
context:
space:
mode:
authorK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2019-04-05 15:54:54 -0700
committerK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2019-04-06 14:19:38 -0700
commit1d55ca503ef44b9c3421d4cea9b2bd53a41bafde (patch)
treeb5f3d5d56f39854f87999d0c0683b84beb17a806 /modules/assimp
parent74719b8748d338c143a62b3659693af0d82b784c (diff)
Assimp: fix FBX import with ':' in filename.
Diffstat (limited to 'modules/assimp')
-rw-r--r--modules/assimp/editor_scene_importer_assimp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp
index 4662cf9d0a..ee66097ffd 100644
--- a/modules/assimp/editor_scene_importer_assimp.cpp
+++ b/modules/assimp/editor_scene_importer_assimp.cpp
@@ -1945,7 +1945,7 @@ void EditorSceneImporterAssimp::_add_mesh_to_mesh_instance(const aiNode *p_node,
morphs[j] = array_copy;
}
- r_name_morph_mesh_names.insert(_ai_raw_string_to_string(p_node->mName), morph_mesh_idx_names);
+ r_name_morph_mesh_names.insert(_ai_string_to_string(p_node->mName), morph_mesh_idx_names);
mesh->add_surface_from_arrays(primitive, array_mesh, morphs);
mesh->surface_set_material(i, mat);
mesh->surface_set_name(i, _ai_string_to_string(ai_mesh->mName));