summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-10-02 13:16:43 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-10-02 13:16:43 +0200
commitb926d32ca784c20b81b99f5a99b013e8a5d7a7ca (patch)
tree6db520f8fb75199bac07289bfb52f6640b814ef2
parent1e819ae3aa9cd1fc78c7b0dfd44a2ffb8546a1b7 (diff)
parent17364e20b5f4c0651e02e62f6fff9136ed0dbee0 (diff)
downloadredot-engine-b926d32ca784c20b81b99f5a99b013e8a5d7a7ca.tar.gz
Merge pull request #82591 from Shnazzy/fix-rotation-order-advanced-import
Fixed the Advanced Import Settings window's 3D camera
-rw-r--r--editor/import/scene_import_settings.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/scene_import_settings.cpp b/editor/import/scene_import_settings.cpp
index 2ef5e89bf7..87b855052b 100644
--- a/editor/import/scene_import_settings.cpp
+++ b/editor/import/scene_import_settings.cpp
@@ -550,7 +550,7 @@ void SceneImportSettings::_update_camera() {
camera->set_orthogonal(camera_size * zoom, 0.0001, camera_size * 2);
Transform3D xf;
- xf.basis = Basis(Vector3(1, 0, 0), rot_x) * Basis(Vector3(0, 1, 0), rot_y);
+ xf.basis = Basis(Vector3(0, 1, 0), rot_y) * Basis(Vector3(1, 0, 0), rot_x);
xf.origin = center;
xf.translate_local(0, 0, camera_size);