diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index ccb4517de08ac3e0cf73aa7214c715461dd52da1..325b6fc3b494532cfa3dde1f2cce03eee8a97692 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, 17), + "version": (1, 7, 18), '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.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather.py index 6f46918acbfe2cbcdc8a47ee4f929ec5d403f6ca..6f68c19eec3e5b4c3757e24754e51856f2697247 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather.py @@ -116,6 +116,10 @@ def __gather_animations(blender_scene, export_settings): to_delete_idx.append(anim_idx) + # Merging extensions + # Provide a hook to handle extension merging since there is no way to know author intent + export_user_extensions('merge_animation_extensions_hook', export_settings, animations[anim_idx], animations[base_animation_idx]) + # Merging extras # Warning, some values can be overwritten if present in multiple merged animations if animations[anim_idx].extras is not None: