Explorar o código

Merge pull request #75990 from capnm/Fix_blend_shape_empty_names

Fix blend_shape (shapekey) empty name import.
Rémi Verschelde %!s(int64=2) %!d(string=hai) anos
pai
achega
a19db2b037
Modificáronse 1 ficheiros con 7 adicións e 1 borrados
  1. 7 1
      modules/gltf/gltf_document.cpp

+ 7 - 1
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);
 					}
 				}