Merge branch 'blender-v4.2-release'

KhronosGroup · Jun 29, 2024 · 2de1bb3 · 2de1bb3
2 parents 2c54f5e + 275e758
commit 2de1bb3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/addons/io_scene_gltf2/__init__.py b/addons/io_scene_gltf2/__init__.py
@@ -15,7 +15,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (4, 3, 6),
+    "version": (4, 3, 7),
     'blender': (4, 2, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',

diff --git a/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py b/addons/io_scene_gltf2/blender/exp/gltf2_blender_gather_nodes.py
@@ -470,6 +470,12 @@ def gather_skin(vnode, export_settings):
         return None
 
     blender_object = export_settings['vtree'].nodes[vnode].blender_object
+
+    # Lattice can have armature modifiers & vertex groups, but we don't want to export them
+    # Avoid crash getting mesh data from lattices
+    if blender_object and blender_object.type == 'LATTICE':
+        return None
+
     modifiers = {m.type: m for m in blender_object.modifiers} if blender_object else {}
     if "ARMATURE" not in modifiers or modifiers["ARMATURE"].object is None:
         return None