[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27740] trunk/blender: Adding menu entries for the new hotkeys (change keying set)

[Joshua Leung]

Revision: 27740
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27740
Author:   aligorith
Date:     2010-03-25 12:42:02 +0100 (Thu, 25 Mar 2010)

Log Message:
-----------
Adding menu entries for the new hotkeys (change keying set)

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/blenkernel/intern/nla.c
    trunk/blender/source/blender/editors/space_nla/nla_edit.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2010-03-25 11:39:21 UTC (rev 27739)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2010-03-25 11:42:02 UTC (rev 27740)
@@ -654,6 +654,7 @@
 
         layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...")
         layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
+        layout.operator("anim.keying_set_active_set", text="Change Keying Set...")
 
         layout.separator()
 
@@ -1020,6 +1021,7 @@
 
         layout.operator("anim.keyframe_insert_menu", text="Insert Keyframe...")
         layout.operator("anim.keyframe_delete_v3d", text="Delete Keyframe...")
+        layout.operator("anim.keying_set_active_set", text="Change Keying Set...")
 
         layout.separator()
 

Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c	2010-03-25 11:39:21 UTC (rev 27739)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c	2010-03-25 11:42:02 UTC (rev 27740)
@@ -44,6 +44,7 @@
 #include "BKE_fcurve.h"
 #include "BKE_nla.h"
 #include "BKE_library.h"
+#include "BKE_utildefines.h"
 
 #include "RNA_access.h"
 #include "nla_private.h"

Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c	2010-03-25 11:39:21 UTC (rev 27739)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c	2010-03-25 11:42:02 UTC (rev 27740)
@@ -914,7 +914,16 @@
 	
 	/* for each AnimData block, bake strips to animdata... */
 	for (ale= anim_data.first; ale; ale= ale->next) {
-		// FIXME
+		AnimData *adt = (AnimData *)ale->data;
+		
+		/* if animdata currently has an action, 'push down' this onto the stack first */
+		BKE_nla_action_pushdown(adt);
+		
+		/* temporarily mute the action, and start keying to it */
+		
+		/* start keying... */
+		
+		/* unmute the action */
 	}
 	
 	/* free temp data */