Merge branch 'main' into update-version

studio/src/lib.rs

@@ -24,6 +24,7 @@ mod hierarchy;
 mod input;
 mod inspector;
 mod interaction;
+pub mod material;
 pub mod math;
 mod mixamo;
 mod path;
@@ -36,6 +37,7 @@ mod ui;
 pub mod viewport;
 mod world_grid;
 
+use crate::material::MaterialPlugin;
 pub use crate::{
     anim::AnimPlugin,
     bvh::BvhPlugin,
@@ -89,6 +91,7 @@ impl PluginGroup for CommonPlugins {
             .add(InspectorPlugin)
             .add(InterpolationPlugin)
             .add(ScenePlugin)
+            .add(MaterialPlugin)
             // .add(SkyboxPlugin)
             .add(StudioInputPlugin)
             .add(UiLayerPlugin)
@@ -231,7 +234,10 @@ fn init_from_asset(app: &mut App, asset: InitAsset, skybox_id: String) {
         }
         InitAsset::ImportedScene(scene) => {
             app.add_systems(Startup, move |mut ew: EventWriter<ImportSceneEvent>| {
-                ew.send(ImportSceneEvent(scene.clone()));
+                ew.send(ImportSceneEvent {
+                    path: scene.clone(),
+                    name: None,
+                });
             });
         }
     }