diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-07 21:57:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-07 21:57:26 +0200 |
| commit | f52c294a748e4bc4e561fb497480560aacda2d59 (patch) | |
| tree | cf076d80ed62d2cb437030890cc8fbd0cb4315ad /modules/assimp/editor_scene_importer_assimp.cpp | |
| parent | 4fad7608c4a9762fca27ed00896f444b6de65de4 (diff) | |
| parent | 1d55ca503ef44b9c3421d4cea9b2bd53a41bafde (diff) | |
Merge pull request #27714 from fire/asset_import
FBX Import bug fixes with special character in mesh names
Diffstat (limited to 'modules/assimp/editor_scene_importer_assimp.cpp')
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 2 |
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)); |