Merge branch 'blender-v4.4-release'

scripts/addons_core/io_scene_gltf2/__init__.py

@@ -5,7 +5,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, 5, 13),
+    "version": (4, 5, 14),
     'blender': (4, 4, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',

scripts/addons_core/io_scene_gltf2/blender/exp/tree.py

@@ -772,6 +772,12 @@ class VExportTree:
 
                 for bone in armature.data.edit_bones:
                     if len(bone.children) == 0:
+
+                        # If we are exporting only deform bones, we need to check if this bone is a def bone
+                        if self.export_settings['gltf_def_bones'] is True \
+                            and bone.use_deform is False:
+                                continue
+
                         self.nodes[self.nodes[obj_uuid].bones[bone.name]
                                    ].matrix_world_tail = armature.matrix_world @ Matrix.Translation(bone.tail) @ self.axis_basis_change
 
@@ -780,6 +786,11 @@ class VExportTree:
         for bone_uuid in [n for n in self.nodes if self.nodes[n].blender_type == VExportNode.BONE
                           and len(self.nodes[n].children) == 0]:
 
+            # If we are exporting only deform bones, we need to check if this bone is a def bone
+            if self.export_settings['gltf_def_bones'] is True \
+                and self.nodes[bone_uuid].use_deform is False:
+                    continue
+
             bone_node = self.nodes[bone_uuid]
 
             # Add a new node