diff options
| author | Joshua Leung <aligorith@gmail.com> | 2006-11-30 04:57:14 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2006-11-30 04:57:14 +0300 |
| commit | d310f203da61eedf01d43f5c8690e8a58d5a584c (patch) | |
| tree | 607b22c7e288f6e86a653a0c695d6654a8063d1f /source/blender/src/header_time.c | |
| parent | 2572b9f72c8f10b01de949e59b481ac5a587aca4 (diff) | |
Big Commit.
Now time-markers work in all time-related spaces (i.e. Ipo,
Action Editor, NLA editor, TimeLine, Sound). The hotkeys and
functionality set should be the same for each of these modes
(with a few exceptions still). I've had to change a few hotkeys
here and there, so hopefully they aren't too bad.
Marker Operations:
MKEY - Add Marker
SHIFT MKEY - Rename marker (was CTRL MKEY)
XKEY - Delete Marker
PAGE UP - Jump to next marker
PAGE DOWN - Jump to previous marker
CTRL A - Select all markers
SHIFT G - Transform markers (NLA, IPO, Action)
G - Transform markers (Sound, Timeline)
CTRL SHIFT D - Duplicate markers (NLA, IPO, Action)
SHIFT D - Duplicate markers (Sound, Timeline)
BKEY - select markers and other keyframes (if any)
I've also made a few little tool additions to NLA and Action editors:
* NLA editor - Snap To Frame.
Now with the option to offset strip so that it starts at the current frame.
Added menus for this.
* Action editor - Snap To Frame
A few new menus for this too
Diffstat (limited to 'source/blender/src/header_time.c')
| -rw-r--r-- | source/blender/src/header_time.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/src/header_time.c b/source/blender/src/header_time.c index d5ecd383fab..b0a9b45ca95 100644 --- a/source/blender/src/header_time.c +++ b/source/blender/src/header_time.c @@ -203,10 +203,10 @@ static void do_time_viewmenu(void *arg, int event) stime->flag ^= TIME_DRAWFRAMES; break; case 6: - nextprev_timeline_marker(1); + nextprev_marker(1); break; case 7: - nextprev_timeline_marker(-1); + nextprev_marker(-1); break; case 8: nextprev_timeline_key(1); @@ -290,22 +290,26 @@ static void do_time_framemenu(void *arg, int event) allqueue(REDRAWALL, 1); break; case 3: /* Add Marker */ - add_timeline_marker(CFRA); + add_marker(CFRA); break; case 4: /* Remove Marker */ - remove_timeline_marker(); + remove_marker(); break; case 5: /* Rename Marker */ - rename_timeline_marker(); + rename_marker(); break; case 6: /* Grab Marker */ - timeline_grab('g', 0); + transform_markers('g', 0); break; case 7: /* duplicate marker */ - duplicate_timeline_marker(); + duplicate_marker(); break; } allqueue(REDRAWTIME, 0); + allqueue(REDRAWIPO, 0); + allqueue(REDRAWACTION, 0); + allqueue(REDRAWNLA, 0); + allqueue(REDRAWSOUND, 0); } static uiBlock *time_framemenu(void *arg_unused) @@ -319,14 +323,14 @@ static uiBlock *time_framemenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Marker|M", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate Marker|M", 0, yco-=20, + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate Marker|Shift D", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Marker|X", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Name Marker|Ctrl M", 0, yco-=20, + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Name Marker|Shift M", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move Marker|G", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, ""); |