diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-01-04 12:30:50 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-01-04 12:30:50 +0300 |
| commit | eb1ca77fc430d5beeb9f12f99688651ada016e85 (patch) | |
| tree | 72d18252568bbc78029f34fb826fa9c44e64e65c /source/blender/src/editview.c | |
| parent | 6643cc53d96ecdff119c18a5bf6ccf35726ab37f (diff) | |
Bugfix #5411
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.
Diffstat (limited to 'source/blender/src/editview.c')
| -rw-r--r-- | source/blender/src/editview.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index 210c0fff7db..16c695288a4 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -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}; |