From 2992a996293894d0b74b2129adaaea430a24cec7 Mon Sep 17 00:00:00 2001 From: Martin Capitanio Date: Wed, 12 Apr 2023 16:05:31 +0200 Subject: Fix blend_shape (shapekey) empty name import. Corresponds to the Blender glTF-Importer PR https://github.com/KhronosGroup/glTF-Blender-IO/pull/1902 (cherry picked from commit 8b6fa79eee25d721a05518b56615eb5576147eba) --- modules/gltf/gltf_document.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 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); } } -- cgit v1.2.3