From 228c3df75134a5bf8140c2919349d721476790f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois?= <mockersf@gmail.com>
Date: Fri, 1 Jan 2021 22:30:18 +0100
Subject: [PATCH] use Name on node when loading a gltf file (#1183)

* export Name in prelude
* use Name instead of Labels in gltf scenes
---
 crates/bevy_core/src/lib.rs    | 2 +-
 crates/bevy_gltf/src/loader.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_core/src/lib.rs b/crates/bevy_core/src/lib.rs
index 282a2b3d30..368889cb6c 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};
diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs
index 30860e2bb5..55fa2442ee 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