From 4b28fd4f23378d73bcbb5a3bd51472c450e94719 Mon Sep 17 00:00:00 2001 From: Marios Staikopoulos Date: Wed, 27 Nov 2019 12:19:08 -0800 Subject: Bugfix: Sanitize glTF importer Animation Names and do not set bone_pose --- editor/import/editor_scene_importer_gltf.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'editor') diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index a10d27f7cd..be066e15a5 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -2143,7 +2143,6 @@ Error EditorSceneImporterGLTF::_create_skeletons(GLTFState &state) { skeleton->add_bone(node->name); skeleton->set_bone_rest(bone_index, node->xform); - skeleton->set_bone_pose(bone_index, node->xform); if (node->parent >= 0 && state.nodes[node->parent]->skeleton == skel_i) { const int bone_parent = skeleton->find_bone(state.nodes[node->parent]->name); @@ -2324,7 +2323,7 @@ Error EditorSceneImporterGLTF::_parse_animations(GLTFState &state) { Array samplers = d["samplers"]; if (d.has("name")) { - animation.name = d["name"]; + animation.name = _sanitize_scene_name(d["name"]); } for (int j = 0; j < channels.size(); j++) { -- cgit v1.2.3