diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-01-29 19:42:57 +0300 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-01-29 19:42:57 +0300 |
commit | 2f4ca518ea468f6c2e06a70aa24f16cf8a141425 (patch) | |
tree | 345202ea0fdd63429f4207003ef44aeebe8578ac /source/blender/src/header_action.c | |
parent | 5da7f4df472f41997a1f424315f94d0d04b3dd30 (diff) | |
parent | fd9db17021064552cdecbcfadce4255257d71e17 (diff) |
svn merge -r 13415:13452 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/src/header_action.c')
-rw-r--r-- | source/blender/src/header_action.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index f9a3fb08bd8..c48e646af4c 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -98,7 +98,8 @@ enum { ACTMENU_VIEW_NOHIDE, ACTMENU_VIEW_OPENLEVELS, ACTMENU_VIEW_CLOSELEVELS, - ACTMENU_VIEW_EXPANDALL + ACTMENU_VIEW_EXPANDALL, + ACTMENU_VIEW_TRANSDELDUPS }; enum { @@ -333,6 +334,9 @@ static void do_action_viewmenu(void *arg, int event) case ACTMENU_VIEW_EXPANDALL: /* Expands all channels */ expand_all_action(); break; + case ACTMENU_VIEW_TRANSDELDUPS: /* Don't delete duplicate/overlapping keyframes after transform */ + G.saction->flag ^= SACTION_NOTRANSKEYCULL; + break; } allqueue(REDRAWVIEW3D, 0); } @@ -378,7 +382,14 @@ static uiBlock *action_viewmenu(void *arg_unused) "Show Hidden Channels|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_VIEW_NOHIDE, ""); - + + // this option may get removed in future... + uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NOTRANSKEYCULL)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, + "AfterTrans Delete Dupli-Frames|", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 1, + ACTMENU_VIEW_TRANSDELDUPS, ""); + + uiDefIconTextBut(block, BUTM, 1, (G.v2d->flag & V2D_VIEWLOCK)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, "Lock Time to Other Windows|", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, |