summaryrefslogtreecommitdiff
path: root/scene/2d
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-11-24 08:38:16 +0100
committerGitHub <noreply@github.com>2020-11-24 08:38:16 +0100
commit43e383e656ee99d8d186fa83b85970cd603fbe21 (patch)
treec9bd98fd6438f5ebc2217d804e7981d3ec0186dd /scene/2d
parent59fdfc77e8f3d455ff6c86c73c27b04b022843c8 (diff)
parentb9c08977132a40b64c85d8522c01015900d4b1b9 (diff)
Merge pull request #43786 from greenfox1505/3.2_Fix-Camera2D-ZoomRotation-Master
fixed Camera2D rotation with non-square zoom
Diffstat (limited to 'scene/2d')
-rw-r--r--scene/2d/camera_2d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index e22b24c16f..79b0b64efb 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -198,10 +198,10 @@ Transform2D Camera2D::get_camera_transform() {
camera_screen_center = screen_rect.position + screen_rect.size * 0.5;
Transform2D xform;
+ xform.scale_basis(zoom);
if (rotating) {
xform.set_rotation(angle);
}
- xform.scale_basis(zoom);
xform.set_origin(screen_rect.position /*.floor()*/);
/*