Handle materials being locked when setting wireframe colors.

Author: andriyDev

crates/bevy_pbr/src/wireframe.rs

@@ -41,7 +41,7 @@ impl Plugin for WireframePlugin {
             .add_systems(
                 Update,
                 (
-                    global_color_changed.run_if(resource_changed::<WireframeConfig>),
+                    global_color_changed,
                     wireframe_color_changed,
                     // Run `apply_global_wireframe_material` after `apply_wireframe_material` so that the global
                     // wireframe setting is applied to a mesh on the same frame its wireframe marker component is removed.
@@ -115,12 +115,22 @@ fn setup_global_wireframe_material(
 
 /// Updates the wireframe material of all entities without a [`WireframeColor`] or without a [`Wireframe`] component
 fn global_color_changed(
+    mut desynced: Local<bool>,
     config: Res<WireframeConfig>,
     mut materials: ResMut<Assets<WireframeMaterial>>,
     global_material: Res<GlobalWireframeMaterial>,
 ) {
-    if let Some(global_material) = materials.get_mut(&global_material.handle) {
+    if config.is_changed() {
+        *desynced = true;
+    }
+    if !*desynced {
+        // There's been no change, so bail out early.
+        return;
+    }
+    if let Ok(global_material) = materials.get_mut(&global_material.handle) {
         global_material.color = config.default_color.into();
+        // Clear the desynced flag to mark that we don't need to rerun this system.
+        *desynced = false;
     }
 }
 

crates/bevy_sprite/src/mesh2d/wireframe2d.rs

@@ -41,7 +41,7 @@ impl Plugin for Wireframe2dPlugin {
             .add_systems(
                 Update,
                 (
-                    global_color_changed.run_if(resource_changed::<Wireframe2dConfig>),
+                    global_color_changed,
                     wireframe_color_changed,
                     // Run `apply_global_wireframe_material` after `apply_wireframe_material` so that the global
                     // wireframe setting is applied to a mesh on the same frame its wireframe marker component is removed.
@@ -111,12 +111,22 @@ fn setup_global_wireframe_material(
 
 /// Updates the wireframe material of all entities without a [`Wireframe2dColor`] or without a [`Wireframe2d`] component
 fn global_color_changed(
+    mut desynced: Local<bool>,
     config: Res<Wireframe2dConfig>,
     mut materials: ResMut<Assets<Wireframe2dMaterial>>,
     global_material: Res<GlobalWireframe2dMaterial>,
 ) {
-    if let Some(global_material) = materials.get_mut(&global_material.handle) {
+    if config.is_changed() {
+        *desynced = true;
+    }
+    if !*desynced {
+        // There's been no change, so bail out early.
+        return;
+    }
+    if let Ok(global_material) = materials.get_mut(&global_material.handle) {
         global_material.color = config.default_color.into();
+        // Clear the desynced flag to mark that we don't need to rerun this system.
+        *desynced = false;
     }
 }