summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-11-29 14:46:01 +0100
committerGitHub <noreply@github.com>2021-11-29 14:46:01 +0100
commitcae5615a22d82d820366f75b0f5d807eea2fcdfe (patch)
tree62cae5f51a8223545ac11a066f9fc8c5941ec923 /scene
parentd2ac4bb48e701f5641e512de671ec93076a5b292 (diff)
parent7257bb6ad00517c586f981ccf65255c9a2303911 (diff)
Merge pull request #55417 from ekumlin/issue-54856
Diffstat (limited to 'scene')
-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 bf5671be19..b6902686fe 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -176,7 +176,7 @@ Transform2D Camera2D::get_camera_transform() {
Rect2 screen_rect(-screen_offset + ret_camera_pos, screen_size * zoom);
- if (!limit_smoothing_enabled) {
+ if (!smoothing_enabled || !limit_smoothing_enabled) {
if (screen_rect.position.x < limit[SIDE_LEFT]) {
screen_rect.position.x = limit[SIDE_LEFT];
}