Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2020-01-14 15:49:30 +0300
committerAlexander Gavrilov <angavrilov@gmail.com>2020-01-14 16:13:06 +0300
commit283d76932a74971b8be06a988c2e0646fdbc1b78 (patch)
tree3c0a4efe3500690be9d75a1ae046c5831d7e6eaa /release/scripts/modules
parentd49fa504fdf08d439957def88b532410beaeea5a (diff)
Fix T57159: don't exit tweak mode in Bake Action if reusing the action.
Diffstat (limited to 'release/scripts/modules')
-rw-r--r--release/scripts/modules/bpy_extras/anim_utils.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/release/scripts/modules/bpy_extras/anim_utils.py b/release/scripts/modules/bpy_extras/anim_utils.py
index e402c9cb53c..d5e328f5c51 100644
--- a/release/scripts/modules/bpy_extras/anim_utils.py
+++ b/release/scripts/modules/bpy_extras/anim_utils.py
@@ -249,11 +249,14 @@ def bake_action_iter(
if action is None:
action = bpy.data.actions.new("Action")
- # Leave tweak mode before trying to modify the action (T48397)
- if atd.use_tweak_mode:
- atd.use_tweak_mode = False
+ # Only leave tweak mode if we actually need to modify the action (T57159)
+ if action != atd.action:
+ # 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
# -------------------------------------------------------------------------
# Apply transformations to action