Skip to content

Commit c0e4950

Browse files
ickshonpecart
authored andcommitted
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 c6d7740 commit c0e4950

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
@@ -58,6 +58,7 @@ pub const UI_SHADER_HANDLE: HandleUntyped =
5858
#[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
5959
pub enum RenderUiSystem {
6060
ExtractNode,
61+
ExtractAtlasNode,
6162
}
6263

6364
pub fn build_ui_render(app: &mut App) {
@@ -81,10 +82,12 @@ pub fn build_ui_render(app: &mut App) {
8182
extract_default_ui_camera_view::<Camera2d>,
8283
extract_default_ui_camera_view::<Camera3d>,
8384
extract_uinodes.in_set(RenderUiSystem::ExtractNode),
84-
extract_atlas_uinodes.after(RenderUiSystem::ExtractNode),
85-
extract_uinode_borders.after(RenderUiSystem::ExtractNode),
85+
extract_atlas_uinodes
86+
.in_set(RenderUiSystem::ExtractAtlasNode)
87+
.after(RenderUiSystem::ExtractNode),
88+
extract_uinode_borders.after(RenderUiSystem::ExtractAtlasNode),
8689
#[cfg(feature = "bevy_text")]
87-
extract_text_uinodes.after(RenderUiSystem::ExtractNode),
90+
extract_text_uinodes.after(RenderUiSystem::ExtractAtlasNode),
8891
),
8992
)
9093
.add_systems(

0 commit comments

Comments
 (0)