From d310f203da61eedf01d43f5c8690e8a58d5a584c Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Thu, 30 Nov 2006 01:57:14 +0000 Subject: 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 --- source/blender/src/drawaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/src/drawaction.c') diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index ae476530cde..62e5ad1071d 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -697,7 +697,7 @@ void drawactionspace(ScrArea *sa, void *spacedata) draw_cfra_action(); /* Draw markers */ - draw_markers_action(G.saction); + draw_markers_timespace(&(G.saction->v2d)); /* Draw scroll */ mywinset(curarea->win); // reset scissor too -- cgit v1.2.3