From fe0ad10b0c12bbef3ce8dc8f55a201085a196802 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Mon, 17 Apr 2023 18:29:44 +0100 Subject: [PATCH] Fix text systems broken when resolving merge conflicts in #8026 (#8422) # 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 --- crates/bevy_ui/src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/bevy_ui/src/lib.rs b/crates/bevy_ui/src/lib.rs index 38d583740a..ef92291ac4 100644 --- a/crates/bevy_ui/src/lib.rs +++ b/crates/bevy_ui/src/lib.rs @@ -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` // 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` @@ -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), ), );