From 7019bb181e3dfdddc4dbe67153333ff29df954ff Mon Sep 17 00:00:00 2001 From: Julien Duroure Date: Fri, 25 Aug 2023 16:42:58 +0200 Subject: [PATCH] Fix #1972 --- .../fcurves/gltf2_blender_gather_fcurves_channels.py | 7 +++++-- .../blender/exp/animation/gltf2_blender_gather_action.py | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/io_scene_gltf2/blender/exp/animation/fcurves/gltf2_blender_gather_fcurves_channels.py b/addons/io_scene_gltf2/blender/exp/animation/fcurves/gltf2_blender_gather_fcurves_channels.py index 6d6baa878..46b81bfdb 100644 --- a/addons/io_scene_gltf2/blender/exp/animation/fcurves/gltf2_blender_gather_fcurves_channels.py +++ b/addons/io_scene_gltf2/blender/exp/animation/fcurves/gltf2_blender_gather_fcurves_channels.py @@ -40,7 +40,7 @@ def gather_animation_fcurves_channels( custom_range = (blender_action.frame_start, blender_action.frame_end) channels = [] - for chan in [chan for chan in channels_to_perform.values() if len(chan['properties']) != 0]: + for chan in [chan for chan in channels_to_perform.values() if len(chan['properties']) != 0 and chan['type'] != "EXTRA"]: for channel_group in chan['properties'].values(): channel = __gather_animation_fcurve_channel(chan['obj_uuid'], channel_group, chan['bone'], custom_range, export_settings) if channel is not None: @@ -83,7 +83,10 @@ def get_channel_groups(obj_uuid: str, blender_action: bpy.types.Action, export_s else: try: target = get_object_from_datapath(blender_object, object_path) - type_ = "BONE" + if blender_object.type == "ARMATURE" and fcurve.data_path.startswith("pose.bones["): + type_ = "BONE" + else: + type_ = "EXTRA" if blender_object.type == "MESH" and object_path.startswith("key_blocks"): shape_key = blender_object.data.shape_keys.path_resolve(object_path) if skip_sk(shape_key): diff --git a/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_action.py b/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_action.py index a37348f0c..ad8c7d872 100644 --- a/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_action.py +++ b/addons/io_scene_gltf2/blender/exp/animation/gltf2_blender_gather_action.py @@ -304,6 +304,8 @@ def gather_action_animations( obj_uuid: int, channel = gather_sampled_object_channel(obj_uuid, prop, blender_action.name, True, get_gltf_interpolation("LINEAR"), export_settings) elif type_ == "SK": channel = gather_sampled_sk_channel(obj_uuid, blender_action.name, export_settings) + elif type_ == "EXTRA": + channel = None else: print("Type unknown. Should not happen")