From 703ae5df5d99a5508a74ff7cc3f7514c57304169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois?= <mockersf@gmail.com>
Date: Mon, 4 Apr 2022 20:26:11 +0000
Subject: [PATCH] gltf: add a name to nodes without names (#4396)

# Objective

- Animation is using `Name` to be able to address nodes in an entity free way
- When loading random animated gltf files, I noticed some had animations without names sometimes

## Solution

- Add default names to all nodes
---
 crates/bevy_gltf/src/loader.rs | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/crates/bevy_gltf/src/loader.rs b/crates/bevy_gltf/src/loader.rs
index a4f0aa98d8846..4680cce54844d 100644
--- a/crates/bevy_gltf/src/loader.rs
+++ b/crates/bevy_gltf/src/loader.rs
@@ -518,15 +518,21 @@ async fn load_gltf<'a, 'b>(
     Ok(())
 }
 
+fn node_name(node: &Node) -> Name {
+    let name = node
+        .name()
+        .map(|s| s.to_string())
+        .unwrap_or_else(|| format!("GltfNode{}", node.index()));
+    Name::new(name)
+}
+
 fn paths_recur(node: Node, current_path: &[Name], paths: &mut HashMap<usize, Vec<Name>>) {
-    if let Some(name) = node.name() {
-        let mut path = current_path.to_owned();
-        path.push(Name::new(name.to_string()));
-        for child in node.children() {
-            paths_recur(child, &path, paths);
-        }
-        paths.insert(node.index(), path);
+    let mut path = current_path.to_owned();
+    path.push(node_name(&node));
+    for child in node.children() {
+        paths_recur(child, &path, paths);
     }
+    paths.insert(node.index(), path);
 }
 
 /// Loads a glTF texture as a bevy [`Image`] and returns it together with its label.
@@ -678,9 +684,7 @@ fn load_node(
         Mat4::from_cols_array_2d(&transform.matrix()),
     )));
 
-    if let Some(name) = gltf_node.name() {
-        node.insert(Name::new(name.to_string()));
-    }
+    node.insert(node_name(gltf_node));
 
     // create camera node
     if let Some(camera) = gltf_node.camera() {