Adding menu entries for the new hotkeys (change keying set)
authorJoshua Leung <aligorith@gmail.com>
Thu, 25 Mar 2010 11:42:02 +0000 (11:42 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 25 Mar 2010 11:42:02 +0000 (11:42 +0000)
release/scripts/ui/space_view3d.py
source/blender/blenkernel/intern/nla.c
source/blender/editors/space_nla/nla_edit.c

index eced38edb533104f99e36d69e84b16618620cc05..3cc588ecbaa77dbabad132bf57c33daa31912c53 100644 (file)
@@ -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()
 
index 56da45ed19ab853dce8a8c0ed851aea0ae77fde3..4af007a5f91094492da9340bc824ba92719643ab 100644 (file)
@@ -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"
index 5eac0a624a90c82fb86f48b8d293621e4c70868b..37961ea4f030a34539bfa642850942d115d5c35f 100644 (file)
@@ -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 */