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>2021-08-23 23:24:15 +0300
committerJulien Duroure <julien.duroure@gmail.com>2021-08-23 23:24:15 +0300
commita8c700d4ebe6a1a767758a0b79775d48d7fbe085 (patch)
treeab77004453efd8535e63f77953fda5d93bfd7296
parent1757ec91e58a23c6dbd31b763267e1d3f5e40026 (diff)
glTF exporter: fix animation export when no channels are valid
-rwxr-xr-xio_scene_gltf2/__init__.py2
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py3
-rwxr-xr-xio_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py6
3 files changed, 6 insertions, 5 deletions
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 0abcb811..08f5cbd1 100755
--- a/io_scene_gltf2/__init__.py
+++ b/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": (1, 7, 22),
+ "version": (1, 7, 23),
'blender': (2, 91, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py
index 6c184198..3046a1ce 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animation_channels.py
@@ -118,7 +118,8 @@ def gather_animation_channels(blender_action: bpy.types.Action,
blender_action.name,
obj,
False)
- channels.append(channel)
+ if channel is not None:
+ channels.append(channel)
else:
for channel_group in __get_channel_groups(blender_action, blender_object, export_settings):
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py
index 06e6860c..819c8085 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py
@@ -121,12 +121,12 @@ def __gather_animation(blender_action: bpy.types.Action,
print_console("WARNING", "Animation '{}' could not be exported. Cause: {}".format(name, error))
return None
- # To allow reuse of samplers in one animation,
- __link_samplers(animation, export_settings)
-
if not animation.channels:
return None
+ # To allow reuse of samplers in one animation,
+ __link_samplers(animation, export_settings)
+
export_user_extensions('gather_animation_hook', export_settings, animation, blender_action, blender_object)
return animation