diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-24 10:51:33 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-24 10:51:33 +0400 |
| commit | dbd5c5b8a13795a32f6d5bb1f4ae3c2b89058b47 (patch) | |
| tree | 8df4a74a18f48cfc72c36f9d52bf8ac7b2809055 /source/blender/editors/animation | |
| parent | 0f4fd4f5b17d4fff97cc3cde4cc7d144137154ca (diff) | |
2.5 - Animation Tweaks (KeyingSets/NLA)
* Insert Keyframes menu now only displays the 'active keyingset' entry when there are some KeyingSets.
* Moved the validation code for auto-blending/extend modes to NLA editor code, and included calls for this in many of the editing tools for NLA strips.
* Removed obsolete 'ID_IPO' entries from RNA-ID wrapping (these were commented out anyway).
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 251c59c47c9..a6f379a9eed 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1081,9 +1081,15 @@ static int insert_key_menu_invoke (bContext *C, wmOperator *op, wmEvent *event) pup= uiPupMenuBegin(C, "Insert Keyframe", 0); layout= uiPupMenuLayout(pup); - /* active Keying Set */ - uiItemIntO(layout, "Active Keying Set", 0, "ANIM_OT_insert_keyframe_menu", "type", i++); - uiItemS(layout); + /* active Keying Set + * - only include entry if it exists + */ + if (scene->active_keyingset) { + uiItemIntO(layout, "Active Keying Set", 0, "ANIM_OT_insert_keyframe_menu", "type", i++); + uiItemS(layout); + } + else + i++; /* user-defined Keying Sets * - these are listed in the order in which they were defined for the active scene @@ -1112,7 +1118,7 @@ static int insert_key_menu_invoke (bContext *C, wmOperator *op, wmEvent *event) void ANIM_OT_insert_keyframe_menu (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframe"; + ot->name= "Insert Keyframe Menu"; ot->idname= "ANIM_OT_insert_keyframe_menu"; /* callbacks */ |