diff options
| author | Juan Linietsky | 2018-06-25 10:58:04 -0300 |
|---|---|---|
| committer | GitHub | 2018-06-25 10:58:04 -0300 |
| commit | ad4666f8e0c4a110f0cc07e0555b0808916a4cf4 (patch) | |
| tree | 3e0dd0df094e0aab311b1ec4f17663f2fca82528 /editor/import | |
| parent | 682c2f249369e18724ffbe1c2c7ba617c05fb379 (diff) | |
| parent | 9d41161596167984efdb02639d0857da8979b01b (diff) | |
| download | godot-ad4666f8e0c4a110f0cc07e0555b0808916a4cf4.tar.gz godot-ad4666f8e0c4a110f0cc07e0555b0808916a4cf4.tar.zst godot-ad4666f8e0c4a110f0cc07e0555b0808916a4cf4.zip | |
Diffstat (limited to 'editor/import')
| -rw-r--r-- | editor/import/editor_import_collada.cpp | 6 | ||||
| -rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 2fb3bf7b1..a13f741ee 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -1785,8 +1785,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones } } - Quat q = xform.basis; - q.normalize(); + Quat q = xform.basis.get_rotation_quat(); Vector3 s = xform.basis.get_scale(); Vector3 l = xform.origin; @@ -1838,8 +1837,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones xform = sk->get_bone_rest(nm.bone).affine_inverse() * xform; - Quat q = xform.basis; - q.normalize(); + Quat q = xform.basis.get_rotation_quat(); Vector3 s = xform.basis.get_scale(); Vector3 l = xform.origin; diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 777f757bb..eb0bc0f78 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -1989,8 +1989,7 @@ void EditorSceneImporterGLTF::_import_animation(GLTFState &state, AnimationPlaye int bone = node->joints[i].godot_bone_index; xform = skeleton->get_bone_rest(bone).affine_inverse() * xform; - rot = xform.basis; - rot.normalize(); + rot = xform.basis.get_rotation_quat(); scale = xform.basis.get_scale(); pos = xform.origin; } |
