Merge pull request #102503 from clayjohn/instance-uniform-free

Ensure instance uniforms are freed by updating dirty items before freeing
godotengine · Feb 7, 2025 · d497631 · d497631
2 parents 0bccb0a + b676944
commit d497631
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/servers/rendering/renderer_canvas_cull.cpp b/servers/rendering/renderer_canvas_cull.cpp
@@ -2605,8 +2605,8 @@ bool RendererCanvasCull::free(RID p_rid) {
 		}
 
 		canvas_item_set_material(canvas_item->self, RID());
-		canvas_item->instance_uniforms.free(canvas_item->self);
 		update_dirty_items();
+		canvas_item->instance_uniforms.free(canvas_item->self);
 
 		if (canvas_item->canvas_group != nullptr) {
 			memdelete(canvas_item->canvas_group);