seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #112930 from stuartcarnie/fix_clip_children

Browse Source 
2D: Fix clip children
This commit is contained in:
Thaddeus Crews
2025-11-19 11:03:54 -06:00
parent b15a13eed3 bd2d596ca7
commit fe0c187ba5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
View File

@ -3243,7 +3243,6 @@ RendererCanvasRenderRD::Batch *RendererCanvasRenderRD::_new_batch(bool &r_batch_
if (!must_remap) { if (!must_remap) {
state.instance_data = state.prev_instance_data; state.instance_data = state.prev_instance_data;
state.instance_data_index = state.prev_instance_data_index; state.instance_data_index = state.prev_instance_data_index;
new_batch.start = state.instance_data_index;
} }
state.prev_instance_data = nullptr; state.prev_instance_data = nullptr;
state.prev_instance_data_index = 0; state.prev_instance_data_index = 0;
@ -3253,6 +3252,9 @@ RendererCanvasRenderRD::Batch *RendererCanvasRenderRD::_new_batch(bool &r_batch_
if (state.instance_data == nullptr) { if (state.instance_data == nullptr) {
// If there is no existing instance buffer, we must allocate a new one. // If there is no existing instance buffer, we must allocate a new one.
_allocate_instance_buffer(); _allocate_instance_buffer();
} else {
// Otherwise, just use the existing one from where it last left off.
new_batch.start = state.instance_data_index;
} }
new_batch.instance_buffer = state.instance_buffers._get(0); new_batch.instance_buffer = state.instance_buffers._get(0);
state.canvas_instance_batches.push_back(new_batch); state.canvas_instance_batches.push_back(new_batch);