Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v2.82-release'

Browse Source
This commit is contained in:
mano-wii
2020-01-14 10:49:45 -03:00
parent efa3605ec0 0187735eea
commit 3a1745235f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
release/scripts/modules/bpy_extras/anim_utils.py
View File

@@ -249,11 +249,17 @@ def bake_action_iter(
if action is None: if action is None:
action = bpy.data.actions.new("Action") action = bpy.data.actions.new("Action")
# Leave tweak mode before trying to modify the action (T48397) # Only leave tweak mode if we actually need to modify the action (T57159)
if atd.use_tweak_mode: if action != atd.action:
atd.use_tweak_mode = False # Leave tweak mode before trying to modify the action (T48397)
if atd.use_tweak_mode:
atd.use_tweak_mode = False
atd.action = action atd.action = action
# Baking the action only makes sense in Replace mode, so force it (T69105)
if not atd.use_tweak_mode:
atd.action_blend_type = 'REPLACE'
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# Apply transformations to action # Apply transformations to action