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 /servers/rendering/renderer_canvas_cull.cpp | |
| parent | 93acaca8ca0ae0cd369aa2ffa1a8f1128a08e42b (diff) | |
| parent | 2df9a8ccadf3e7f99d767456eedb0e559c96572c (diff) | |
| download | redot-engine-e9d12f9e4ea30a6c3f2cf179f104a153d668c2a3.tar.gz | |
Merge pull request #44521 from madmiraal/rename-rect2-clip
Rename Rect2 and Rect2i clip() to intersection()
Diffstat (limited to 'servers/rendering/renderer_canvas_cull.cpp')
| -rw-r--r-- | servers/rendering/renderer_canvas_cull.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_canvas_cull.cpp b/servers/rendering/renderer_canvas_cull.cpp index a397ba4389..53deba512e 100644 --- a/servers/rendering/renderer_canvas_cull.cpp +++ b/servers/rendering/renderer_canvas_cull.cpp @@ -144,7 +144,7 @@ void RendererCanvasCull::_cull_canvas_item(Item *p_canvas_item, const Transform2 if (ci->clip) { if (p_canvas_clip != nullptr) { - ci->final_clip_rect = p_canvas_clip->final_clip_rect.clip(global_rect); + ci->final_clip_rect = p_canvas_clip->final_clip_rect.intersection(global_rect); } else { ci->final_clip_rect = global_rect; } @@ -195,7 +195,7 @@ void RendererCanvasCull::_cull_canvas_item(Item *p_canvas_item, const Transform2 } if (ci->copy_back_buffer) { - ci->copy_back_buffer->screen_rect = xform.xform(ci->copy_back_buffer->rect).clip(p_clip_rect); + ci->copy_back_buffer->screen_rect = xform.xform(ci->copy_back_buffer->rect).intersection(p_clip_rect); } if (use_canvas_group) { |