diff options
| author | Martin Capitanio <capnm@capitanio.org> | 2023-04-12 16:05:31 +0200 |
|---|---|---|
| committer | Martin Capitanio <capnm@capitanio.org> | 2023-04-12 16:37:49 +0200 |
| commit | 8b6fa79eee25d721a05518b56615eb5576147eba (patch) | |
| tree | 52a5976529505f8d5e9bc01f946e48f5fc359a23 /modules/gltf/gltf_document.cpp | |
| parent | cd03028915295e67d72cd91dbd46eafb207f92d1 (diff) | |
| download | redot-engine-8b6fa79eee25d721a05518b56615eb5576147eba.tar.gz | |
Fix blend_shape (shapekey) empty name import.
Corresponds to the Blender glTF-Importer PR
https://github.com/KhronosGroup/glTF-Blender-IO/pull/1902
Diffstat (limited to 'modules/gltf/gltf_document.cpp')
| -rw-r--r-- | modules/gltf/gltf_document.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index d93485a800..7087c30688 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -2820,7 +2820,13 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> p_state) { if (j == 0) { const Array &target_names = extras.has("targetNames") ? (Array)extras["targetNames"] : Array(); for (int k = 0; k < targets.size(); k++) { - import_mesh->add_blend_shape(k < target_names.size() ? (String)target_names[k] : String("morph_") + itos(k)); + String bs_name; + if (k < target_names.size() && ((String)target_names[k]).size() != 0) { + bs_name = (String)target_names[k]; + } else { + bs_name = String("morph_") + itos(k); + } + import_mesh->add_blend_shape(bs_name); } } |