diff options
author | Michel Selten <michel@mselten.demon.nl> | 2003-08-06 16:25:24 +0400 |
---|---|---|
committer | Michel Selten <michel@mselten.demon.nl> | 2003-08-06 16:25:24 +0400 |
commit | cf322b1a9aa296c83169cb70f1158ee00af1beb3 (patch) | |
tree | fc611cbfe13955fac33f69be4fa1aec5ebc27288 | |
parent | d3e2e5e660fd4dbf93cf1041e73a06dd4fc2a52b (diff) |
* Fix problem that edge select hotkey doesn't work on Linux.
Edge select is now _only_ working with ctrl-alt-RMB. Patch provided by
Roel Spruit (Goofster).
-rw-r--r-- | source/blender/src/editmesh.c | 4 | ||||
-rw-r--r-- | source/blender/src/space.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index 9860f9039e3..19bae703d1e 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -2105,7 +2105,9 @@ void mouse_mesh(void) { EditVert *act=0; - if(G.qual & LR_ALTKEY) edge_select(); + if(G.qual & LR_ALTKEY) { + if (G.qual & LR_CTRLKEY) edge_select(); + } else { act= findnearestvert(1); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index e59555a02dd..304b3b990a9 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -664,6 +664,7 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) else if(G.obedit->type==OB_LATTICE) mouse_lattice(); else if(G.obedit->type==OB_ARMATURE) mouse_armature(); } + else if(G.obedit && ((G.qual & LR_CTRLKEY) && (G.qual & LR_ALTKEY))) mouse_mesh(); else if(G.obpose) { if (G.obpose->type==OB_ARMATURE) mousepose_armature(); } |