diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-06 09:34:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 09:34:15 +0100 |
| commit | 89dd51d4331b332df69df97964d72d73a7423fce (patch) | |
| tree | bcbccb480efc998219419bc5197362e113f7a91c | |
| parent | 3cf3c4137a4e6a5e25d7950ff727ec2157e40a37 (diff) | |
| parent | c2b6a900fcb7db4645a8b94998c6257c5d82978c (diff) | |
Merge pull request #23538 from groud/fix_scaling
Fixes uniform scaling weird behavior
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 31dd20e453..bb3ae1dac9 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -1696,7 +1696,7 @@ bool CanvasItemEditor::_gui_input_scale(const Ref<InputEvent> &p_event) { if (drag_type == DRAG_SCALE_BOTH) { Size2 scale_factor = drag_to_local / drag_from_local; if (uniform) { - if (ABS(offset.x) > ABS(offset.y)) { + if (ABS(scale_factor.x - 1.0) > ABS(scale_factor.y - 1.0)) { scale.x *= scale_factor.x; scale.y = scale.x * ratio; } else { |