Merge branch 'blender-v3.0-release'

This commit is contained in:
Philipp Oeser 2021-11-22 14:16:10 +01:00
commit 4de1bcce5a
2 changed files with 10 additions and 3 deletions

View File

@ -21,7 +21,7 @@
bl_info = {
"name": "FBX format",
"author": "Campbell Barton, Bastien Montagne, Jens Restemeier",
"version": (4, 26, 0),
"version": (4, 27, 0),
"blender": (2, 90, 0),
"location": "File > Import-Export",
"description": "FBX IO meshes, UV's, vertex colors, materials, textures, cameras, lamps and actions",

View File

@ -2091,8 +2091,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:
@ -2113,8 +2119,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: