Skip to content

Commit a879f98

Browse files
authored
UI extraction order fix (#9099)
# Objective Fixes #9097 ## Solution Reorder the `ExtractSchedule` so that the `extract_text_uinodes` and `extract_uinode_borders` systems are run after `extract_atlas_uinodes`. ## Changelog `bevy_ui::render`: * Added the `ExtractAtlasNode` variant to `RenderUiSystem`. * Changed `ExtractSchedule` so that `extract_uinode_borders` and `extract_text_uinodes` run after `extract_atlas_uinodes`.
1 parent 70a7eb0 commit a879f98

File tree

1 file changed

+6
-3
lines changed
  • crates/bevy_ui/src/render

1 file changed

+6
-3
lines changed

crates/bevy_ui/src/render/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pub const UI_SHADER_HANDLE: HandleUntyped =
5959
#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
6060
pub enum RenderUiSystem {
6161
ExtractNode,
62+
ExtractAtlasNode,
6263
}
6364

6465
pub fn build_ui_render(app: &mut App) {
@@ -82,10 +83,12 @@ pub fn build_ui_render(app: &mut App) {
8283
extract_default_ui_camera_view::<Camera2d>,
8384
extract_default_ui_camera_view::<Camera3d>,
8485
extract_uinodes.in_set(RenderUiSystem::ExtractNode),
85-
extract_atlas_uinodes.after(RenderUiSystem::ExtractNode),
86-
extract_uinode_borders.after(RenderUiSystem::ExtractNode),
86+
extract_atlas_uinodes
87+
.in_set(RenderUiSystem::ExtractAtlasNode)
88+
.after(RenderUiSystem::ExtractNode),
89+
extract_uinode_borders.after(RenderUiSystem::ExtractAtlasNode),
8790
#[cfg(feature = "bevy_text")]
88-
extract_text_uinodes.after(RenderUiSystem::ExtractNode),
91+
extract_text_uinodes.after(RenderUiSystem::ExtractAtlasNode),
8992
),
9093
)
9194
.add_systems(

0 commit comments

Comments
 (0)