godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes naming conflict in GLTF importer

This commit is contained in:
SaracenOne 2021-09-27 17:52:32 +01:00
parent 6a058cbf39
commit c6387e58e9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gltf/gltf_document.cpp
View File

@ -598,9 +598,9 @@ Error GLTFDocument::_parse_scenes(Ref<GLTFState> state) {
}
if (s.has("name") && !String(s["name"]).empty() && !((String)s["name"]).begins_with("Scene")) {
state->scene_name = _gen_unique_name(state, s["name"]);
state->scene_name = s["name"];
} else {
state->scene_name = _gen_unique_name(state, state->filename);
state->scene_name = state->filename;
}
}
@ -4952,6 +4952,9 @@ void GLTFDocument::_assign_scene_names(Ref<GLTFState> state) {
n->set_name(_gen_unique_name(state, n->get_name()));
}
// Assign a unique name to the scene last to avoid naming conflicts with the root
state->scene_name = _gen_unique_name(state, state->scene_name);
}
BoneAttachment *GLTFDocument::_generate_bone_attachment(Ref<GLTFState> state, Skeleton *skeleton, const GLTFNodeIndex node_index, const GLTFNodeIndex bone_index) {