Merge pull request #8170 from RandomShaper/fix-uniform-move-2.1

Include uniform (Shift down) mode in only-one-Node2D dragging (2.1)
This commit is contained in:
Rémi Verschelde 2017-03-27 08:57:05 +02:00 committed by GitHub
commit e3d6d863af

View file

@ -1529,7 +1529,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent &p_event) {
dto = dto - (drag == DRAG_ALL || drag == DRAG_NODE_2D ? drag_from - drag_point_from : Vector2(0, 0)); dto = dto - (drag == DRAG_ALL || drag == DRAG_NODE_2D ? drag_from - drag_point_from : Vector2(0, 0));
if (uniform && drag == DRAG_ALL) { if (uniform && (drag == DRAG_ALL || drag == DRAG_NODE_2D)) {
if (ABS(dto.x - drag_point_from.x) > ABS(dto.y - drag_point_from.y)) { if (ABS(dto.x - drag_point_from.x) > ABS(dto.y - drag_point_from.y)) {
dto.y = drag_point_from.y; dto.y = drag_point_from.y;
} else { } else {