Merge pull request #2352 from KhronosGroup/fix_2337

Fix #2337 - fix hook parameters
KhronosGroup · Sep 12, 2024 · 69ca15c · 69ca15c
2 parents 4a06ea4 + 21b515e
commit 69ca15c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/addons/io_scene_gltf2/blender/exp/animation/sampled/object/channels.py b/addons/io_scene_gltf2/blender/exp/animation/sampled/object/channels.py
@@ -90,6 +90,8 @@ def gather_sampled_object_channel(
                                animation_channel,
                                channel,
                                export_settings['vtree'].nodes[obj_uuid].blender_object,
+                               None, # No bone
+                               action_name,
                                node_channel_is_animated
                                )
 

diff --git a/example-addons/example_gltf_exporter_extension/readme.md b/example-addons/example_gltf_exporter_extension/readme.md
@@ -19,7 +19,7 @@ Next, define functions that contain the data of the extension you would like to
 
 ```
 gather_animation_hook(self, gltf2_animation, blender_action, blender_object, export_settings)
-gather_animation_channel_hook(self, gltf2_animation_channel, channel, blender_object, action_name, node_channel_is_animated, export_settings)
+gather_animation_channel_hook(self, gltf2_animation_channel, channel, blender_object, bone, action_name, node_channel_is_animated, export_settings)
 gather_animation_channel_target_hook(self, gltf2_animation_channel_target, channels, blender_object, bake_bone, bake_channel, export_settings)
 gather_animation_sampler_hook(self, gltf2_sampler, blender_object, bone, action_name, node_channel_is_animated, export_settings)
 gather_asset_hook(self, gltf2_asset, export_settings)
@@ -54,7 +54,6 @@ animation_switch_loop_hook(self, blender_object, post, export_settings) # post =
 animation_track_switch_loop_hook(self, blender_object, post, export_settings) # post = False before loop, True after loop # for track mode
 animation_gather_fcurve(self, blender_object, blender_action, export_settings)
 animation_action_object_sampled(self, gltf2_animation, blender_object, blender_action, cache_key, export_settings)
-gather_animation_channel_hook(self, animation_channel, channel, blender_object, node_channel_is_animated, export_settings)
 animation_gather_object_channel(self, blender_object, blender_action_name, export_settings)
 animation_gather_object_sampler(self, blender_object, action_name, export_settings)
 animation_action_sk_sampled(self, gltf2_animation, blender_object, blender_action, cache_key, export_settings)