Selecting option conflict... shift+alt+click was used both for 'select with
a menu' as for 'flush selection to group members'.
Solution for now: keep the group select for shift+alt+click, and menu select
for alt+click.
This commit is contained in:
Ton Roosendaal
2007-01-04 09:30:50 +00:00
parent 6643cc53d9
commit eb1ca77fc4

View File

@@ -1266,7 +1266,9 @@ void mouse_select(void)
/* This block uses the control key to make the object selected by its centre point rather then its contents */
if(G.obedit==0 && (G.qual & LR_CTRLKEY)) {
if(G.qual & LR_ALTKEY) basact= mouse_select_menu(NULL, 0, mval);
/* note; shift+alt goes to group-flush-selecting */
if(G.qual == (LR_ALTKEY|LR_CTRLKEY))
basact= mouse_select_menu(NULL, 0, mval);
else {
base= startbase;
while(base) {
@@ -1300,7 +1302,8 @@ void mouse_select(void)
for(a=0; a<hits; a++) if(buffer[4*a+3] & 0xFFFF0000) has_bones= 1;
if(has_bones==0 && (G.qual & LR_ALTKEY))
/* note; shift+alt goes to group-flush-selecting */
if(has_bones==0 && (G.qual == LR_ALTKEY))
basact= mouse_select_menu(buffer, hits, mval);
else {
static short lastmval[2]={-100, -100};