diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-19 21:32:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 21:32:14 +0100 |
| commit | e9d12f9e4ea30a6c3f2cf179f104a153d668c2a3 (patch) | |
| tree | f1d12e916b17a749335ef2e39151863e7d56280c /scene/resources/texture.cpp | |
| parent | 93acaca8ca0ae0cd369aa2ffa1a8f1128a08e42b (diff) | |
| parent | 2df9a8ccadf3e7f99d767456eedb0e559c96572c (diff) | |
Merge pull request #44521 from madmiraal/rename-rect2-clip
Rename Rect2 and Rect2i clip() to intersection()
Diffstat (limited to 'scene/resources/texture.cpp')
| -rw-r--r-- | scene/resources/texture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 1507537cd0..706b18d2b5 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -1253,7 +1253,7 @@ bool AtlasTexture::get_rect_region(const Rect2 &p_rect, const Rect2 &p_src_rect, Vector2 scale = p_rect.size / src.size; src.position += (rc.position - margin.position); - Rect2 src_c = rc.clip(src); + Rect2 src_c = rc.intersection(src); if (src_c.size == Size2()) { return false; } @@ -1575,7 +1575,7 @@ void LargeTexture::draw_rect_region(RID p_canvas_item, const Rect2 &p_rect, cons if (!p_src_rect.intersects(rect)) { continue; } - Rect2 local = p_src_rect.clip(rect); + Rect2 local = p_src_rect.intersection(rect); Rect2 target = local; target.size *= scale; target.position = p_rect.position + (p_src_rect.position + rect.position) * scale; |