diff options
-rw-r--r-- | release/scripts/ui/space_view3d.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/nla.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_edit.c | 11 |
3 files changed, 13 insertions, 1 deletions
diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index eced38edb53..3cc588ecbaa 100644 --- a/release/scripts/ui/space_view3d.py +++ b/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() diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index 56da45ed19a..4af007a5f91 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/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" diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index 5eac0a624a9..37961ea4f03 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/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 */ |