diff options
| author | Joshua Leung <aligorith@gmail.com> | 2006-12-18 08:15:17 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2006-12-18 08:15:17 +0300 |
| commit | abda07819627e327023b2d4012e75f433eb02ca4 (patch) | |
| tree | 9ba012eea83506d71e8bcd85e28344566718f137 /source/blender/src/header_nla.c | |
| parent | 26a7d5fe6b98c22c7ce17ab8c629bcf2be1e4b9a (diff) | |
== NLA Editor ==
Todo Tracker Item: #4754
Now the 'Convert Action to NLA Strip' command (CKEY) is able to
be found in the NLA editor's header in the Strip Menu. It now tries
to add a convert the active action of the active object (so it is no
longer dependant on mouse location).
Diffstat (limited to 'source/blender/src/header_nla.c')
| -rw-r--r-- | source/blender/src/header_nla.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/header_nla.c b/source/blender/src/header_nla.c index 57cb2431f1a..c14fea48dc6 100644 --- a/source/blender/src/header_nla.c +++ b/source/blender/src/header_nla.c @@ -304,6 +304,7 @@ static void do_nla_stripmenu(void *arg, int event) } break; case 5: /* Convert Action to NLA Strip */ + convert_nla(); break; case 6: /* Move Up */ shift_nlastrips_up(); @@ -337,6 +338,8 @@ static uiBlock *nla_stripmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Action Strip|Shift A", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Convert Action to NLA Strip|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate|Shift D", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete|X", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, ""); @@ -344,8 +347,7 @@ static uiBlock *nla_stripmenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Down|Ctrl Page Down", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Move Up|Ctrl Page Up", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, ""); - - // uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Convert Action to NLA Strip|C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, ""); + if(curarea->headertype==HEADERTOP) { uiBlockSetDirection(block, UI_DOWN); |