瀏覽代碼

Merge pull request #23885 from glaforte/bugfix/22848-attempt2

Avoids error messages when importing zero scale transforms in the COLLADA importer
Rémi Verschelde 6 年之前
父節點
當前提交
f673bd017d
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      editor/import/editor_import_collada.cpp

+ 2 - 2
editor/import/editor_import_collada.cpp

@@ -1655,7 +1655,7 @@ void ColladaImport::create_animation(int p_clip, bool p_make_tracks_in_all_bones
 				}
 			}
 
-			Quat q = xform.basis.get_rotation_quat();
+			Quat q = Math::is_equal_approx(xform.basis.determinant(), 0) ? Quat() : xform.basis.get_rotation_quat();
 			Vector3 s = xform.basis.get_scale();
 			Vector3 l = xform.origin;
 
@@ -1705,7 +1705,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.get_rotation_quat();
+			Quat q = Math::is_equal_approx(xform.basis.determinant(), 0) ? Quat() : xform.basis.get_rotation_quat();
 			Vector3 s = xform.basis.get_scale();
 			Vector3 l = xform.origin;