Adding menu entries for the new hotkeys (change keying set)

release/scripts/ui/space_view3d.py

@@ -654,6 +654,7 @@ class VIEW3D_MT_object(bpy.types.Menu):
 
         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 @@ class VIEW3D_MT_pose(bpy.types.Menu):
 
         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()
 

source/blender/blenkernel/intern/nla.c

@@ -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"

source/blender/editors/space_nla/nla_edit.c

@@ -914,7 +914,16 @@ static int nlaedit_bake_exec (bContext *C, wmOperator *op)
 	
 	/* 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 */