diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py index c57370e208ce65c0e43cf93ee18b05b212ce09f2..7b60678d84044d023c83c5cbff103a85d568ae89 100755 --- a/io_scene_gltf2/__init__.py +++ b/io_scene_gltf2/__init__.py @@ -4,7 +4,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": (3, 2, 29), + "version": (3, 2, 30), 'blender': (3, 1, 0), 'location': 'File > Import-Export', 'description': 'Import-Export as glTF 2.0', 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 6e62507a7cc3440eb58d91ad6ad342e7323a0680..2b8a0682bb21a3f91e72d9faa21e05dca2b5cf05 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_animations.py @@ -100,6 +100,11 @@ def gather_animations( obj_uuid: int, if blender_object.animation_data: restore_tweak_mode = blender_object.animation_data.use_tweak_mode + # Remove use of NLA. Restore after export + if blender_object.animation_data: + current_use_nla = blender_object.animation_data.use_nla + blender_object.animation_data.use_nla = False + # Export all collected actions. for blender_action, track_name, on_type in blender_actions: @@ -143,6 +148,8 @@ def gather_animations( obj_uuid: int, if solo_track is not None: solo_track.is_solo = True blender_object.animation_data.use_tweak_mode = restore_tweak_mode + blender_object.animation_data.use_nla = current_use_nla + return animations, tracks