Merge pull request #36689 from eevee/patch-1

Fix inverted use of Camera2D.offset_v

Merge pull request #36689 from eevee/patch-1
da8a0913 · Rémi Verschelde · GitHub · 3c7d92c5 · 40816574 · da8a0913
Unverified Commit da8a0913 authored Mar 03, 2020 by Rémi Verschelde Committed by GitHub Mar 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

camera_2d.cpp scene/2d/camera_2d.cpp +2 -2

No files found.
--- 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;