[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39603] trunk/blender/release/scripts/ startup/bl_operators/nla.py: patch [#28320] Small change to trunk needed for Motion Capture Addon - GSoC 2011 - Pepper Branch

[Campbell Barton]

Revision: 39603
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39603
Author:   campbellbarton
Date:     2011-08-22 08:47:48 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
patch [#28320] Small change to trunk needed for Motion Capture Addon - GSoC 2011 - Pepper Branch
from Benjy Cook (benjycook) 

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/nla.py

Modified: trunk/blender/release/scripts/startup/bl_operators/nla.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/nla.py	2011-08-22 04:45:03 UTC (rev 39602)
+++ trunk/blender/release/scripts/startup/bl_operators/nla.py	2011-08-22 08:47:48 UTC (rev 39603)
@@ -84,6 +84,7 @@
          do_pose=True,
          do_object=True,
          do_constraint_clear=False,
+         action=None,
          ):
 
     scene = bpy.context.scene
@@ -121,7 +122,8 @@
 
     # 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: