diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 19:58:52 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 19:58:52 -0300 |
| commit | 94fdd01241749cb7a575ed5f9fa4c7bbb286901a (patch) | |
| tree | b262b537c98d7d66124552dcf96e741fcabf5c58 | |
| parent | fe9f4eda9e668952749bcdcb740da39f92d8fa7d (diff) | |
| parent | 18392e28b6ab689ce334bc112f259b5d8be5c2ce (diff) | |
Merge pull request #2702 from TheHX/fix_align_with_view
Fix 3D editor align with current view
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index f3458a768a..8d5e7bbaea 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1957,11 +1957,11 @@ void SpatialEditorViewport::_menu_option(int p_option) { if (!se) continue; - Vector3 original_scale = sp->get_scale(); - sp->set_global_transform(camera_transform); - sp->set_scale(original_scale); - undo_redo->add_do_method(sp,"set_global_transform",sp->get_global_transform()); - undo_redo->add_undo_method(sp,"set_global_transform",se->original); + Transform 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_transform()); } undo_redo->commit_action(); } break; |