From 616fb219db608d635fecd7856b4ca3b44fae346d Mon Sep 17 00:00:00 2001
From: Ranoller <davarrcal@hotmail.com>
Date: Mon, 15 Jun 2020 16:34:03 +0200
Subject: [PATCH] (3.2) Fix bad position in Camera2D offset and camera rotation
 if smothing enabled

Fix https://github.com/godotengine/godot/issues/16323 in 3.2 branch. Apply same solution of https://github.com/godotengine/godot/issues/2074 in rotation and offset.
---
 scene/2d/camera_2d.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index 907d0bedfa8..9b671d5e9ef 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -351,7 +351,9 @@ void Camera2D::_notification(int p_what) {
 void Camera2D::set_offset(const Vector2 &p_offset) {
 
 	offset = p_offset;
+	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 	_update_scroll();
+	smoothed_camera_pos = old_smoothed_camera_pos;
 }
 
 Vector2 Camera2D::get_offset() const {
@@ -373,7 +375,9 @@ Camera2D::AnchorMode Camera2D::get_anchor_mode() const {
 void Camera2D::set_rotating(bool p_rotating) {
 
 	rotating = p_rotating;
+	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 	_update_scroll();
+	smoothed_camera_pos = old_smoothed_camera_pos;
 }
 
 bool Camera2D::is_rotating() const {
@@ -559,7 +563,9 @@ void Camera2D::set_v_offset(float p_offset) {
 
 	v_ofs = p_offset;
 	v_offset_changed = true;
+	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 	_update_scroll();
+	smoothed_camera_pos = old_smoothed_camera_pos;
 }
 
 float Camera2D::get_v_offset() const {
@@ -571,7 +577,9 @@ void Camera2D::set_h_offset(float p_offset) {
 
 	h_ofs = p_offset;
 	h_offset_changed = true;
+	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 	_update_scroll();
+	smoothed_camera_pos = old_smoothed_camera_pos;
 }
 float Camera2D::get_h_offset() const {