diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-03 10:39:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 10:39:12 +0100 |
| commit | da8a0913f481abd4704cd12fb10995c45b62c87d (patch) | |
| tree | e997c23827f2add3c542e131433689dd35f0c544 /scene/2d | |
| parent | 3c7d92c590f48ea9a265ec20d7af43a3aa44632f (diff) | |
| parent | 40816574ac789af9cfcc061eea5bd91aa1079f6b (diff) | |
Merge pull request #36689 from eevee/patch-1
Fix inverted use of Camera2D.offset_v
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/camera_2d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 1419fb561e..a8860c3d81 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -128,9 +128,9 @@ Transform2D Camera2D::get_camera_transform() { } else { if (v_ofs < 0) { - camera_pos.y = new_camera_pos.y + screen_size.y * 0.5 * drag_margin[MARGIN_TOP] * v_ofs; - } else { camera_pos.y = new_camera_pos.y + screen_size.y * 0.5 * drag_margin[MARGIN_BOTTOM] * v_ofs; + } else { + camera_pos.y = new_camera_pos.y + screen_size.y * 0.5 * drag_margin[MARGIN_TOP] * v_ofs; } v_offset_changed = false; |