godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix order of transformation in GLTF import 

From the gltf 2 spec, the order is R  * S. Previously we did S * R, which broke some mesh with non-uniform scale.

Fix #23356, Fix #14725
This commit is contained in:
Vivatchai Kaveeta 2019-03-18 03:08:46 +07:00
parent df7d3708c5
commit 32dd9c67c6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/import/editor_scene_importer_gltf.cpp
View File

@ -237,8 +237,7 @@ Error EditorSceneImporterGLTF::_parse_nodes(GLTFState &state) {
node->scale = _arr_to_vec3(n["scale"]); node->scale = _arr_to_vec3(n["scale"]);
} }
node->xform.basis = Basis(node->rotation); node->xform.basis.set_quat_scale(node->rotation, node->scale);
node->xform.basis.scale(node->scale);
node->xform.origin = node->translation; node->xform.origin = node->translation;
} }