diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-27 22:01:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-27 22:01:24 +0100 |
| commit | a87a871250cb7369b701bab5daf11999bdb20b70 (patch) | |
| tree | 97bfdebe37ce116548adbb4efbeb3916049c6a20 | |
| parent | 9e3fb2b1e868f660f625590ae27dc52b27dcf935 (diff) | |
| parent | 4b28fd4f23378d73bcbb5a3bd51472c450e94719 (diff) | |
Merge pull request #33953 from marstaik/gltf_bugfix
Bugfix: Sanitize glTF importer Animation Names and do not set bone_pose
| -rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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++) { |