Merge pull request #92 from hymm/fix-assets-loops

Fix assets loops
hymm · Jan 26, 2023 · e4c586d · e4c586d
2 parents ad44974 + 8efe4cf
commit e4c586d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/crates/bevy_asset/src/assets.rs b/crates/bevy_asset/src/assets.rs
@@ -331,16 +331,8 @@ impl AddAsset for App {
         };
 
         self.insert_resource(assets)
-            .add_system(
-                Assets::<T>::asset_event_system
-                    .in_set(AssetSet::AssetEvents)
-                    .in_set(CoreSet::Update),
-            )
-            .add_system(
-                update_asset_storage_system::<T>
-                    .in_set(AssetSet::LoadAssets)
-                    .in_set(CoreSet::Update),
-            )
+            .add_system(Assets::<T>::asset_event_system.in_set(AssetSet::AssetEvents))
+            .add_system(update_asset_storage_system::<T>.in_set(AssetSet::LoadAssets))
             .register_type::<Handle<T>>()
             .add_event::<AssetEvent<T>>()
     }

diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs
@@ -123,10 +123,6 @@ impl Plugin for AssetPlugin {
             feature = "filesystem_watcher",
             all(not(target_arch = "wasm32"), not(target_os = "android"))
         ))]
-        app.add_system(
-            io::filesystem_watcher_system
-                .in_set(AssetSet::LoadAssets)
-                .in_set(CoreSet::Update),
-        );
+        app.add_system(io::filesystem_watcher_system.in_set(AssetSet::LoadAssets));
     }
 }