diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-27 17:06:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-27 17:06:50 +0100 |
| commit | 9d7343a1a36713d364e2457e4c12b703e8b539fa (patch) | |
| tree | 7e4e6baf5f91f8165b33a8dd588e5ee821f4c9c2 | |
| parent | 1b4204fd76b5edd3e07bf4b1e0609fa870cd6884 (diff) | |
| parent | 32dd9c67c683d40e98b444eab4a0a57a270c1276 (diff) | |
Merge pull request #27182 from goodyttoor/gltf_order
Fix order of transformation in GLTF import
| -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 7032146229..7cdac7da33 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -237,8 +237,7 @@ Error EditorSceneImporterGLTF::_parse_nodes(GLTFState &state) { node->scale = _arr_to_vec3(n["scale"]); } - node->xform.basis = Basis(node->rotation); - node->xform.basis.scale(node->scale); + node->xform.basis.set_quat_scale(node->rotation, node->scale); node->xform.origin = node->translation; } |