diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-07 21:58:48 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-07 21:58:48 +0200 |
| commit | d7b1d8440c4d3aafd3e5cbe1d15eccf4d8529eb9 (patch) | |
| tree | a1fdc3115a59f656006d958fae00c33ad4cf2186 | |
| parent | 85e994bffb1a6bf5a5267826b7cac3f5d60212df (diff) | |
| parent | b83359518fbc5e36e7eca37a5ae83e7d2c1b632b (diff) | |
| download | redot-engine-d7b1d8440c4d3aafd3e5cbe1d15eccf4d8529eb9.tar.gz | |
Merge pull request #94035 from markdibarry/parallax2d-remove-unused
Remove unused assignment in Parallax2D
| -rw-r--r-- | scene/2d/parallax_2d.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scene/2d/parallax_2d.cpp b/scene/2d/parallax_2d.cpp index aacab3213d..b3586a1da0 100644 --- a/scene/2d/parallax_2d.cpp +++ b/scene/2d/parallax_2d.cpp @@ -86,11 +86,10 @@ void Parallax2D::_update_scroll() { } Point2 scroll_ofs = screen_offset; - Size2 vps = get_viewport_rect().size; - if (Engine::get_singleton()->is_editor_hint()) { - vps = Size2(GLOBAL_GET("display/window/size/viewport_width"), GLOBAL_GET("display/window/size/viewport_height")); - } else { + if (!Engine::get_singleton()->is_editor_hint()) { + Size2 vps = get_viewport_rect().size; + if (limit_begin.x <= limit_end.x - vps.x) { scroll_ofs.x = CLAMP(scroll_ofs.x, limit_begin.x, limit_end.x - vps.x); } |