kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Action Editor Markers Bugfix:

Browse Source 
Now it is possible to select multiple markers in action editor when doing
Shift + RMB click.
This commit is contained in:
Joshua Leung 2006-11-16 04:22:17 +00:00
parent 1b3f368e84
commit 1e00c59c23
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/src/editaction.c
View File

@ -643,14 +643,18 @@ static void mouse_action(int selectmode)
allqueue(REDRAWOOPS, 0); allqueue(REDRAWOOPS, 0);
allqueue(REDRAWBUTSALL, 0); allqueue(REDRAWBUTSALL, 0);
} }
else if (marker != NULL) { else if (marker) {
/* not channel, so maybe marker */ /* not channel, so maybe marker */
if (selectmode == SELECT_REPLACE) { if (selectmode == SELECT_REPLACE) {
selectmode = SELECT_ADD;
deselect_saction_markers(markers, 0, 0); deselect_saction_markers(markers, 0, 0);
marker->flag |= SELECT; marker->flag |= SELECT;
} }
else if (selectmode == SELECT_INVERT) {
if (marker->flag & SELECT)
marker->flag &= ~SELECT;
else
marker->flag |= SELECT;
}
else if (selectmode == SELECT_ADD) else if (selectmode == SELECT_ADD)
marker->flag |= SELECT; marker->flag |= SELECT;
else if (selectmode == SELECT_SUBTRACT) else if (selectmode == SELECT_SUBTRACT)
@ -724,6 +728,28 @@ static void mouse_mesh_action(int selectmode, Key *key)
allqueue(REDRAWNLA, 0); allqueue(REDRAWNLA, 0);
} }
else if (marker) {
/* not channel, so maybe marker */
if (selectmode == SELECT_REPLACE) {
deselect_saction_markers(markers, 0, 0);
marker->flag |= SELECT;
}
else if (selectmode == SELECT_INVERT) {
if (marker->flag & SELECT)
marker->flag &= ~SELECT;
else
marker->flag |= SELECT;
}
else if (selectmode == SELECT_ADD)
marker->flag |= SELECT;
else if (selectmode == SELECT_SUBTRACT)
marker->flag &= ~SELECT;
std_rmouse_transform(transform_saction_markers);
allqueue(REDRAWACTION, 0);
allqueue(REDRAWTIME, 0);
}
} }
void borderselect_action(void) void borderselect_action(void)