Merge pull request #106537 from aaronfranke/gltf-per-skel-unique

GLTF: Make skeleton bone names unique per-skeleton instead of scene-wide
This commit is contained in:
Rémi Verschelde
2025-06-10 12:29:55 +02:00
5 changed files with 21 additions and 5 deletions

View File

@ -8627,7 +8627,7 @@ Node *GLTFDocument::_generate_scene_node_tree(Ref<GLTFState> p_state) {
// Generate the skeletons and skins (if any).
HashMap<ObjectID, SkinSkeletonIndex> skeleton_map;
Error err = SkinTool::_create_skeletons(p_state->unique_names, p_state->skins, p_state->nodes,
skeleton_map, p_state->skeletons, p_state->scene_nodes);
skeleton_map, p_state->skeletons, p_state->scene_nodes, _naming_version);
ERR_FAIL_COND_V_MSG(err != OK, nullptr, "glTF: Failed to create skeletons.");
err = _create_skins(p_state);
ERR_FAIL_COND_V_MSG(err != OK, nullptr, "glTF: Failed to create skins.");