diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 18:44:50 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-11-18 18:44:50 -0300 |
| commit | e84fa0414190414e6f3539a6d98ea91bd5e9d3ca (patch) | |
| tree | 94b9e0117e0c71c5a8f0fe4e1843358624440ee8 | |
| parent | 9833fc21e60c407cb8372915ed0b3b6165fbd12d (diff) | |
| parent | da895e8542fcd19545287e4a99654f17c2d4c3d8 (diff) | |
Merge pull request #2764 from guilhermefelipecgs/fix_camera2d_set_zoom
Fix for smoothing camera2D when you change zoom.
| -rw-r--r-- | scene/2d/camera_2d.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 49683da226..52ae5d2954 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -57,7 +57,9 @@ void Camera2D::_update_scroll() { void Camera2D::set_zoom(const Vector2 &p_zoom) { zoom = p_zoom; + Point2 old_smoothed_camera_pos = smoothed_camera_pos; _update_scroll(); + smoothed_camera_pos = old_smoothed_camera_pos; }; Vector2 Camera2D::get_zoom() const { |