Merge pull request #33361 from codecustard/master

Fixes improper undo state for pivot setting
This commit is contained in:
Rémi Verschelde 2019-11-05 15:54:53 +01:00 committed by GitHub
commit 245c99175c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1315,6 +1315,7 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref<InputEvent> &p_event) {
// Start dragging if we still have nodes
if (drag_selection.size() > 0) {
_save_canvas_item_state(drag_selection);
drag_from = transform.affine_inverse().xform((b.is_valid()) ? b->get_position() : viewport->get_local_mouse_position());
Vector2 new_pos;
if (drag_selection.size() == 1) {
@ -1328,7 +1329,6 @@ bool CanvasItemEditor::_gui_input_pivot(const Ref<InputEvent> &p_event) {
}
drag_type = DRAG_PIVOT;
_save_canvas_item_state(drag_selection);
}
return true;
}