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:
authorCampbell Barton <ideasman42@gmail.com>2011-08-22 12:47:48 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-08-22 12:47:48 +0400
commitaa7545b0ea0920c6ee403d305fc0c0a4af9138ae (patch)
tree2276bb5124f9a050d94af0b37c288d0194007a70 /release/scripts
parent17c8621cc819b5082cc356c8da9735eb2e481455 (diff)
patch [#28320] Small change to trunk needed for Motion Capture Addon - GSoC 2011 - Pepper Branch
from Benjy Cook (benjycook)
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_operators/nla.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/nla.py b/release/scripts/startup/bl_operators/nla.py
index 44ed846e530..714b889da26 100644
--- a/release/scripts/startup/bl_operators/nla.py
+++ b/release/scripts/startup/bl_operators/nla.py
@@ -84,6 +84,7 @@ def bake(frame_start,
do_pose=True,
do_object=True,
do_constraint_clear=False,
+ action=None,
):
scene = bpy.context.scene
@@ -121,7 +122,8 @@ def bake(frame_start,
# incase animation data hassnt been created
atd = obj.animation_data_create()
- action = bpy.data.actions.new("Action")
+ if action is None:
+ action = bpy.data.actions.new("Action")
atd.action = action
if do_pose: