From ea8c21b1d537280068f3d91db8ce322ca12cb3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Fri, 1 Jan 2021 19:31:32 +0100 Subject: [PATCH 1/2] export Name in prelude --- crates/bevy_core/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs index 282a2b3d30ca9..368889cb6c3b4 100644 --- a/crates/bevy_core/src/lib.rs +++ b/crates/bevy_core/src/lib.rs @@ -17,7 +17,7 @@ pub use task_pool_options::DefaultTaskPoolOptions; pub use time::*; pub mod prelude { - pub use crate::{DefaultTaskPoolOptions, EntityLabels, Labels, Time, Timer}; + pub use crate::{DefaultTaskPoolOptions, EntityLabels, Labels, Name, Time, Timer}; } use bevy_app::{prelude::*, startup_stage}; From 85768bf41f99a63da31ed0d32de8a5889a4313d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Fri, 1 Jan 2021 19:31:51 +0100 Subject: [PATCH 2/2] use Name instead of Labels in gltf scenes --- crates/bevy_gltf/src/loader.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs index 30860e2bb5350..55fa2442ee26d 100644 --- a/crates/bevy_gltf/src/loader.rs +++ b/crates/bevy_gltf/src/loader.rs @@ -1,6 +1,6 @@ use anyhow::Result; use bevy_asset::{AssetIoError, AssetLoader, AssetPath, Handle, LoadContext, LoadedAsset}; -use bevy_core::Labels; +use bevy_core::Name; use bevy_ecs::{bevy_utils::BoxedFuture, World, WorldBuilderSource}; use bevy_math::Mat4; use bevy_pbr::prelude::{PbrBundle, StandardMaterial}; @@ -318,7 +318,7 @@ fn load_node( )); if let Some(name) = gltf_node.name() { - node.with(Labels::from(vec![name.to_string()])); + node.with(Name::new(name.to_string())); } // create camera node