Skip to content

Commit e459dd9

Browse files
authored
Replace checks for empty uinodes (#17520)
# Objective The `is_empty` checks that are meant to stop zero-sized uinodes from being extracted are missing from `extract_uinode_background_colors`, `extract_uinode_images` and `extract_ui_material_nodes`. ## Solution Put them back.
1 parent 81a25bb commit e459dd9

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

crates/bevy_ui/src/render/mod.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,10 @@ pub fn extract_uinode_background_colors(
307307
};
308308

309309
// Skip invisible backgrounds
310-
if !inherited_visibility.get() || background_color.0.is_fully_transparent() {
310+
if !inherited_visibility.get()
311+
|| background_color.0.is_fully_transparent()
312+
|| uinode.is_empty()
313+
{
311314
continue;
312315
}
313316

@@ -372,6 +375,7 @@ pub fn extract_uinode_images(
372375
|| image.color.is_fully_transparent()
373376
|| image.image.id() == TRANSPARENT_IMAGE_HANDLE.id()
374377
|| image.image_mode.uses_slices()
378+
|| uinode.is_empty()
375379
{
376380
continue;
377381
}

crates/bevy_ui/src/render/ui_material_pipeline.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ pub fn extract_ui_material_nodes<M: UiMaterial>(
392392
};
393393

394394
// skip invisible nodes
395-
if !inherited_visibility.get() {
395+
if !inherited_visibility.get() || uinode.is_empty() {
396396
continue;
397397
}
398398

0 commit comments

Comments
 (0)