mirror of
https://github.com/bevyengine/bevy
synced 2025-02-16 22:18:33 +00:00
# Objective - Incorrectly resolved merge conflicts in https://github.com/bevyengine/bevy/pull/8026 have caused UI text to not render at all. ## Solution Restore correct system schedule for text systems
This commit is contained in:
parent
363d0f0c7c
commit
fe0ad10b0c
1 changed files with 3 additions and 2 deletions
|
@ -122,11 +122,11 @@ impl Plugin for UiPlugin {
|
|||
#[cfg(feature = "bevy_text")]
|
||||
app.add_systems(
|
||||
PostUpdate,
|
||||
widget::text_system
|
||||
widget::measure_text_system
|
||||
.before(UiSystem::Layout)
|
||||
// Potential conflict: `Assets<Image>`
|
||||
// In practice, they run independently since `bevy_render::camera_update_system`
|
||||
// will only ever observe its own render target, and `widget::text_system`
|
||||
// will only ever observe its own render target, and `widget::measure_text_system`
|
||||
// will never modify a pre-existing `Image` asset.
|
||||
.ambiguous_with(CameraUpdateSystem)
|
||||
// Potential conflict: `Assets<Image>`
|
||||
|
@ -157,6 +157,7 @@ impl Plugin for UiPlugin {
|
|||
.before(TransformSystem::TransformPropagate),
|
||||
ui_stack_system.in_set(UiSystem::Stack),
|
||||
update_clipping_system.after(TransformSystem::TransformPropagate),
|
||||
widget::text_system.after(UiSystem::Layout),
|
||||
),
|
||||
);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue