From 9d41161596167984efdb02639d0857da8979b01b Mon Sep 17 00:00:00 2001
From: tagcup
Date: Sat, 26 May 2018 23:14:05 -0400
Subject: Fixed Basis -> Quat conversions, added a few safety checks.

Fixes #19027.
---
 editor/import/editor_import_collada.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'editor/import/editor_import_collada.cpp')

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;
 
-- 
cgit v1.2.3-70-g09d2