diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py index 48d02c739661d4bead2857a0fba2fd47894ff33a..569c2521103e86f13df5bc145b771a727fdfee08 100644 --- a/io_scene_fbx/__init__.py +++ b/io_scene_fbx/__init__.py @@ -21,7 +21,7 @@ bl_info = { "name": "FBX format", "author": "Campbell Barton, Bastien Montagne, Jens Restemeier", - "version": (4, 20, 4), + "version": (4, 20, 5), "blender": (2, 81, 6), "location": "File > Import-Export", "description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions", diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py index 1c43180dbe1faed6c7475316a57df59e40602db1..78c2f2828e7fb41b59859b0f8e35d5fcf2d1a7b0 100644 --- a/io_scene_fbx/export_fbx_bin.py +++ b/io_scene_fbx/export_fbx_bin.py @@ -2088,8 +2088,14 @@ def fbx_animations(scene_data): ob = ob_obj.bdata # Back to real Blender Object. if not ob.animation_data: continue + + # Some actions are read-only, one cause is being in NLA tweakmode + restore_use_tweak_mode = ob.animation_data.use_tweak_mode + if ob.animation_data.is_property_readonly('action'): + ob.animation_data.use_tweak_mode = False + # We have to remove active action from objects, it overwrites strips actions otherwise... - ob_actions.append((ob, ob.animation_data.action)) + ob_actions.append((ob, ob.animation_data.action, restore_use_tweak_mode)) ob.animation_data.action = None for track in ob.animation_data.nla_tracks: if track.mute: @@ -2110,8 +2116,9 @@ def fbx_animations(scene_data): for strip in strips: strip.mute = False - for ob, ob_act in ob_actions: + for ob, ob_act, restore_use_tweak_mode in ob_actions: ob.animation_data.action = ob_act + ob.animation_data.use_tweak_mode = restore_use_tweak_mode # All actions. if scene_data.settings.bake_anim_use_all_actions: