Skip to content

Commit

Permalink
📎
Browse files Browse the repository at this point in the history
  • Loading branch information
DJMcNab committed Jan 1, 2022
1 parent f1ad38a commit bfe9cdb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
6 changes: 3 additions & 3 deletions crates/bevy_ecs/src/world/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1219,9 +1219,9 @@ impl Turtle {
}
}

impl Into<World> for Turtle {
fn into(self) -> World {
self.world()
impl From<Turtle> for World {
fn from(turtle: Turtle) -> Self {
turtle.world()
}
}

Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_scene/src/dynamic_scene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub struct DynamicEntity {
impl DynamicScene {
/// Create a new dynamic scene from a given scene.
pub fn from_scene(scene: &Scene, type_registry: &TypeRegistryArc) -> Self {
Self::from_world(&scene.turtle.world_ref(), type_registry)
Self::from_world(scene.turtle.world_ref(), type_registry)
}

/// Create a new dynamic scene from a given world.
Expand Down
7 changes: 1 addition & 6 deletions crates/bevy_scene/src/scene_spawner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,7 @@ impl SceneSpawner {
}
})
})?;
reflect_component.copy_component(
&scene_world,
world,
*scene_entity,
entity,
);
reflect_component.copy_component(scene_world, world, *scene_entity, entity);
}
}
}
Expand Down

0 comments on commit bfe9cdb

Please sign in to comment.