Fix #2321

addons/io_scene_gltf2/blender/com/extras.py

@@ -18,7 +18,7 @@
 
 
 # Custom properties, which are in most cases present and should not be imported/exported.
-BLACK_LIST = ['cycles', 'cycles_visibility', 'cycles_curves', 'glTF2ExportSettings']
+BLACK_LIST = ['cycles', 'cycles_visibility', 'cycles_curves', 'glTF2ExportSettings', 'gltf2_mesh_applied']
 
 
 def generate_extras(blender_element):

addons/io_scene_gltf2/blender/exp/mesh.py

@@ -116,7 +116,7 @@ def __gather_extras(blender_mesh: bpy.types.Mesh,
  extras = generate_extras(blender_mesh) or {}
 
  # Not for GN Instances
- if export_settings['gltf_morph'] and blender_mesh.shape_keys and blender_mesh.users != 0:
+ if export_settings['gltf_morph'] and blender_mesh.shape_keys and ((blender_mesh.is_evaluated is True and blender_mesh.get('gltf2_mesh_applied') is not None) or blender_mesh.is_evaluated is False):
  morph_max = len(blender_mesh.shape_keys.key_blocks) - 1
  if morph_max > 0:
  extras['targetNames'] = [k.name for k in get_sk_exported(blender_mesh.shape_keys.key_blocks)]
@@ -159,7 +159,7 @@ def __gather_weights(blender_mesh: bpy.types.Mesh,
  return None
 
  # Not for GN Instances
- if blender_mesh.users == 0:
+ if blender_mesh.is_evaluated is True and blender_mesh.get('gltf2_mesh_applied') is None:
  return None
 
  morph_max = len(blender_mesh.shape_keys.key_blocks) - 1

addons/io_scene_gltf2/blender/exp/nodes.py

@@ -313,6 +313,8 @@ def __gather_mesh(vnode, blender_object, export_settings):
  # But we need to remove some properties that are not needed
  for prop in [p for p in blender_object.data.keys() if p in BLACK_LIST]:
  del blender_mesh[prop]
+ # Store that this evaluated mesh has been created by the exporter, and is not a GN instance mesh
+ blender_mesh['gltf2_mesh_applied'] = True
 
  if export_settings['gltf_skins']:
  # restore Armature modifiers

addons/io_scene_gltf2/blender/exp/primitive_extract.py

@@ -137,8 +137,7 @@ def prepare_data(self):
  # We need to check if we are in a GN Instance, because for GN instances, it seems that shape keys are preserved,
  # even if we apply modifiers
  # (For classic objects, shape keys are not preserved if we apply modifiers)
- # We can check it by checking if the mesh is used by a user
- if self.blender_mesh.shape_keys and self.export_settings['gltf_morph'] and self.blender_mesh.users != 0:
+ if self.blender_mesh.shape_keys and self.export_settings['gltf_morph'] and ((self.blender_mesh.is_evaluated is True and self.blender_mesh.get('gltf2_mesh_applied') is not None) or self.blender_mesh.is_evaluated is False):
  self.key_blocks = get_sk_exported(self.blender_mesh.shape_keys.key_blocks)
 
  # Fetch vert positions and bone data (joint,weights)