blender
/
blender-addons
17
34
Fork 94
Code Issues 528 Pull Requests 32 Projects 1 Releases Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Julien Duroure 2020-05-04 18:17:52 +02:00
parent 7d43a48bb9 b72a6c0579
commit 58601075ab
3 changed files with 704 additions and 704 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_gltf2/__init__.py
View File

@ -15,7 +15,7 @@
bl_info = {
'name': 'glTF 2.0 format',
'author': 'Julien Duroure, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
"version": (1, 3, 10),
"version": (1, 3, 11),
'blender': (2, 83, 9),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',

1404
io_scene_gltf2/blender/exp/gltf2_blender_extract.py
View File

File diff suppressed because it is too large Load Diff

2
io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channel_target.py
View File

@ -92,7 +92,7 @@ def __gather_node(channels: typing.Tuple[bpy.types.FCurve],
bones, _, _ = gltf2_blender_gather_skins.get_bone_tree(None, blender_object)
if blender_bone.name in [b.name for b in bones]:
obj = blender_object.proxy if blender_object.proxy else blender_object
return gltf2_blender_gather_joints.gather_jointb(obj, blender_bone, export_settings)
return gltf2_blender_gather_joints.gather_joint(obj, blender_bone, export_settings)
return gltf2_blender_gather_nodes.gather_node(blender_object,
blender_object.library.name if blender_object.library else None,