summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-10-22 17:17:05 +0200
committerGitHub <noreply@github.com>2018-10-22 17:17:05 +0200
commitb77a41125847633509a2af7d2e693ebdd4c35c01 (patch)
treefc22e1fd4d7cf6a0e5b13604613b6ffcbae727ba
parent919573f7ce89d001bb207610a4c264a64276a4a3 (diff)
parent808b46cfc238aa08a9e8d5123649ad3fa84c5cae (diff)
Merge pull request #23224 from capnm/fix-Align-selection-with-view-in-orthogonal-mode
Fix 'Align selection with view' in orthogonal mode
-rw-r--r--editor/plugins/spatial_editor_plugin.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index b0d405daab..0dda95832c 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -2535,8 +2535,14 @@ void SpatialEditorViewport::_menu_option(int p_option) {
if (!se)
continue;
- Transform xform = camera_transform;
- xform.scale_basis(sp->get_scale());
+ Transform xform;
+ if (orthogonal) {
+ xform = sp->get_global_transform();
+ xform.basis.set_euler(camera_transform.basis.get_euler());
+ } else {
+ xform = camera_transform;
+ xform.scale_basis(sp->get_scale());
+ }
undo_redo->add_do_method(sp, "set_global_transform", xform);
undo_redo->add_undo_method(sp, "set_global_transform", sp->get_global_gizmo_transform());