Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2006-11-30 04:57:14 +0300
committerJoshua Leung <aligorith@gmail.com>2006-11-30 04:57:14 +0300
commitd310f203da61eedf01d43f5c8690e8a58d5a584c (patch)
tree607b22c7e288f6e86a653a0c695d6654a8063d1f /source/blender/src/editipo_mods.c
parent2572b9f72c8f10b01de949e59b481ac5a587aca4 (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/editipo_mods.c')
-rw-r--r--source/blender/src/editipo_mods.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/src/editipo_mods.c b/source/blender/src/editipo_mods.c
index 581d293b079..9b8c64d4c36 100644
--- a/source/blender/src/editipo_mods.c
+++ b/source/blender/src/editipo_mods.c
@@ -67,6 +67,7 @@
#include "BSE_editipo.h"
#include "BSE_drawipo.h"
#include "BSE_trans_types.h"
+#include "BSE_time.h"
#include "BDR_drawobject.h"
@@ -771,7 +772,10 @@ void borderselect_ipo(void)
mval[0]= rect.xmax;
mval[1]= rect.ymax;
areamouseco_to_ipoco(G.v2d, mval, &rectf.xmax, &rectf.ymax);
-
+
+ /* do markers first */
+ borderselect_markers(rectf.xmin, rectf.xmax, val);
+
if(G.sipo->showkey) {
ik= G.sipo->ipokey.first;
while(ik) {
@@ -812,7 +816,11 @@ void borderselect_ipo(void)
}
}
BIF_undo_push("Border select Ipo");
- scrarea_queue_winredraw(curarea);
+ allqueue(REDRAWTIME, 0);
+ allqueue(REDRAWIPO, 0);
+ allqueue(REDRAWACTION, 0);
+ allqueue(REDRAWNLA, 0);
+ allqueue(REDRAWSOUND, 0);
}
}