Split QuerySet in two queries

Author: UberLambda

crates/bevy_pbr/src/wireframe.rs

@@ -79,13 +79,11 @@ fn prepare_wireframes(
     render_device: Res<RenderDevice>,
     render_queue: Res<RenderQueue>,
     mut wireframe_meta: ResMut<GlobalWireframeMeta>,
-    mut query: QuerySet<(
-        QueryState<(Entity, Option<&Wireframe>), (With<Handle<Mesh>>, With<MeshUniform>)>,
-        QueryState<
-            (Entity, Option<&Wireframe>),
-            (With<Handle<Mesh>>, With<MeshUniform>, With<Wireframe>),
-        >,
-    )>,
+    global_query: Query<(Entity, Option<&Wireframe>), (With<Handle<Mesh>>, With<MeshUniform>)>,
+    wireframe_query: Query<
+        (Entity, Option<&Wireframe>),
+        (With<Handle<Mesh>>, With<MeshUniform>, With<Wireframe>),
+    >,
 ) {
     wireframe_meta.uniforms.clear();
     wireframe_meta.uniforms.push(WireframeUniform {
@@ -105,9 +103,9 @@ fn prepare_wireframes(
     };
 
     if config.global {
-        query.q0().for_each(add_wireframe_uniform);
+        global_query.for_each(add_wireframe_uniform);
     } else {
-        query.q1().for_each(add_wireframe_uniform);
+        wireframe_query.for_each(add_wireframe_uniform);
     }
 
     wireframe_meta