summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-02-22 10:16:36 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-02-22 10:16:36 +0100
commit75d888c10ee64f8398daa5cd2e66ad8d118c39db (patch)
tree11331a30c24b797677a089a993e4084551a15105
parentc29e6ff05e57cd909c9074041413aaf749d456ea (diff)
parent87243508e9c2a3ac3b5af7ff7b300a38f62dca1e (diff)
Merge pull request #3799 from volzhs/rotation_reset
keep previous rotation when using rotate tool. fixes #3788.
-rw-r--r--tools/editor/plugins/canvas_item_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index f3ff001d84..f8bc97a433 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -1560,7 +1560,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
Matrix32 rot;
rot.elements[1] = (dfrom - center).normalized();
rot.elements[0] = rot.elements[1].tangent();
- node->set_rot(snap_angle(rot.xform_inv(dto-center).angle(), node->get_rot()));
+ node->set_rot(snap_angle(rot.xform_inv(dto-center).angle() + node->get_rot(), node->get_rot()));
display_rotate_to = dto;
display_rotate_from = center;
viewport->update();