Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Duroure <julien.duroure@gmail.com>2022-06-04 10:01:23 +0300
committerJulien Duroure <julien.duroure@gmail.com>2022-06-04 10:01:23 +0300
commit6a318b22d143f675ad489171a2b9aa56d9a6c1b6 (patch)
treed8ceb18698b48c2cc302cc04535084e1ba321d27 /io_scene_gltf2
parent016430de4b06714c006bb6de2ae3a28e05a86169 (diff)
parente8244eb4d7c62feea91706436afc9eeacd494a27 (diff)
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'io_scene_gltf2')
-rwxr-xr-xio_scene_gltf2/__init__.py2
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 0d388d97..fd3d2d56 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -4,7 +4,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": (3, 3, 3),
+ "version": (3, 3, 4),
'blender': (3, 3, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
index 143fccea..1ee98a29 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_samplers.py
@@ -391,8 +391,9 @@ def __gather_output(channels: typing.Tuple[bpy.types.FCurve],
parent_uuid = export_settings['vtree'].nodes[export_settings['vtree'].nodes[blender_obj_uuid].bones[bone.name]].parent_uuid
if parent_uuid is not None and export_settings['vtree'].nodes[parent_uuid].blender_type == VExportNode.BONE:
# export bone is not at root of armature neither
+ blender_bone_parent = export_settings['vtree'].nodes[parent_uuid].blender_bone
correction_matrix_local = (
- bone.parent.bone.matrix_local.inverted_safe() @
+ blender_bone_parent.bone.matrix_local.inverted_safe() @
bone.bone.matrix_local
)
else: