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

Merge pull request #90401 from KoBeWi/I_wonder_how_much_this_breaks

Browse Source 
Don't redraw invisible CanvasItems
This commit is contained in:
Thaddeus Crews
2025-10-24 11:23:02 -05:00
parent 751eabde37 6abfa4be7b
commit fbf1c72f15
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scene/main/canvas_item.cpp
View File

@ -136,9 +136,11 @@ void CanvasItem::_redraw_callback() {
return;
}
RID ci = get_canvas_item();
RenderingServer::get_singleton()->canvas_item_clear(ci);
//todo updating = true - only allow drawing here
if (draw_commands_dirty) {
RenderingServer::get_singleton()->canvas_item_clear(get_canvas_item());
draw_commands_dirty = false;
}
if (is_visible_in_tree()) {
drawing = true;
Ref<TextServer> ts = TextServerManager::get_singleton()->get_primary_interface();
@ -154,9 +156,9 @@ void CanvasItem::_redraw_callback() {
ts->set_current_drawn_item_oversampling(0.0);
}
drawing = false;
draw_commands_dirty = true;
}
//todo updating = false
pending_update = false; // don't change to false until finished drawing (avoid recursive update)
pending_update = false; // Don't change to false until finished drawing (avoid recursive update).
}
Transform2D CanvasItem::get_global_transform_with_canvas() const {

2
scene/main/canvas_item.h
View File

@ -37,6 +37,7 @@
class CanvasLayer;
class MultiMesh;
class StyleBox;
class SubViewport;
class Window;
class World2D;
@ -105,6 +106,7 @@ private:
bool visible = true;
bool parent_visible_in_tree = false;
bool pending_update = false;
bool draw_commands_dirty = false;
bool top_level = false;
bool drawing = false;
bool block_transform_notify = false;