diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-05-14 13:00:22 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-05-14 13:00:22 +0400 |
| commit | 9fdb4965a32fdc5fbfe6ad169630672e70d85470 (patch) | |
| tree | 8c25094eb69f70bcb2b05fbf19fcb4be74f4d7e1 /source/blender/src/header_nla.c | |
| parent | f98085bd7ec3aba6775df4ab25c2c5475e37cae3 (diff) | |
NLA and IPO now have the "AfterTrans Keyframe" option that prevents the creation of duplicate keyframes after transform.
Diffstat (limited to 'source/blender/src/header_nla.c')
| -rw-r--r-- | source/blender/src/header_nla.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/src/header_nla.c b/source/blender/src/header_nla.c index ef4b79c0537..13bbf0a3999 100644 --- a/source/blender/src/header_nla.c +++ b/source/blender/src/header_nla.c @@ -128,6 +128,9 @@ static void do_nla_viewmenu(void *arg, int event) case 9: /* Clear Preview Range */ anim_previewrange_clear(); break; + case 10: /* AutoMerge Keyframes */ + G.snla->flag ^= SNLA_NOTRANSKEYCULL; + break; } } @@ -148,6 +151,9 @@ static uiBlock *nla_viewmenu(void *arg_unused) } else { uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Show Seconds|Ctrl T", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, ""); } + + uiDefIconTextBut(block, BUTM, 1, (G.snla->flag & SNLA_NOTRANSKEYCULL)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, + "AutoMerge Keyframes|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); |