diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-24 08:32:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-24 08:32:32 +0100 |
commit | 0ecf2fdd51069a86af86c8a5776f8085c4e74973 (patch) | |
tree | e32762231736437e529505c8d1b1735d09292678 | |
parent | 5ff8d4b07d22e3164894fd1e886e339b024c1a35 (diff) | |
parent | 48611afb80ec3d24b1a3466fb3541dee464eef2f (diff) |
Merge pull request #16018 from volzhs/rotate-line
Rotate Control node with respecting pivot offset
-rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 670f13b6c8..7d6025cb03 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1953,9 +1953,9 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { if (node) { real_t angle = node->get_rotation(); - node->set_rotation(snap_angle(angle + (dfrom - center).angle_to(dto - center), angle)); display_rotate_to = dto; - display_rotate_from = center; + display_rotate_from = center + node->get_pivot_offset().rotated(angle); + node->set_rotation(snap_angle(angle + (dfrom - display_rotate_from).angle_to(display_rotate_to - display_rotate_from), angle)); viewport->update(); } } |