diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-10-27 01:13:00 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-10-27 01:13:00 +0400 |
| commit | f59827f346d4289c5c70fc836a2c21be8a84362e (patch) | |
| tree | 1451935dff08b62af8f8d1aee23069ee31a64765 /source/blender/src/header_action.c | |
| parent | 79f6a4b8225ec32ec2825f228b28c301f74fa624 (diff) | |
More Orange NLA/Action fixes;
- NLA: Hotkey ALT+S resets (synchs) action start/end in selected Strips
- NLA: Panel for Strips allow setting negative "Action start"
- NLA: When transforming strips, the selected keys for that action don't
get included (caused weird errors)
- Action: cleanup of drawing horizontal bars.
- Action: Pulldown menu option "Lock time" was in different location than
for the other pulldowns
Diffstat (limited to 'source/blender/src/header_action.c')
| -rw-r--r-- | source/blender/src/header_action.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 0ace342a2ae..edd3ed8d164 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -237,11 +237,6 @@ static uiBlock *action_viewmenu(void *arg_unused) menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_VIEW_CENTERVIEW, ""); - 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, - ACTMENU_VIEW_LOCK, ""); - uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); @@ -270,6 +265,11 @@ static uiBlock *action_viewmenu(void *arg_unused) menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_VIEW_ALL, ""); + 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, + ACTMENU_VIEW_LOCK, ""); + if (!curarea->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, |