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

Merge pull request #27714 from fire/asset_import 

FBX Import bug fixes with special character in mesh names
This commit is contained in:
Rémi Verschelde 2019-04-07 21:57:26 +02:00 committed by GitHub
parent 4fad7608c4 1d55ca503e
commit f52c294a74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/assimp/editor_scene_importer_assimp.cpp
View File

@ -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));