diff options
author | Ton Roosendaal <ton@blender.org> | 2003-10-29 00:28:13 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2003-10-29 00:28:13 +0300 |
commit | 10c452e13e19f95be649735aa29efeab8eea3734 (patch) | |
tree | 5aec64752be35f116594ac44d52d43a491ffd918 /source/blender/src/space.c | |
parent | dcfdb6f3bcc8d85d004ef218630228d23760e87c (diff) |
- fixed hotkey error; apply object needs 2 combos
- changed call to selectconnected to accept qualifier as input
(need to do that for all such tools... no more checking inside!
Diffstat (limited to 'source/blender/src/space.c')
-rw-r--r-- | source/blender/src/space.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c index ec381deb268..484d5007ab5 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -876,7 +876,7 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) do_layer_buttons(-1); break; case AKEY: - if(G.qual==LR_CTRLKEY) apply_object(); + if(G.qual & LR_CTRLKEY) apply_object(); // also with shift! else if((G.qual==LR_SHIFTKEY)) { tbox_setmain(0); toolbox(); @@ -1113,7 +1113,7 @@ void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) case LKEY: if(G.obedit) { if(G.obedit->type==OB_MESH) - selectconnected_mesh(); + selectconnected_mesh(G.qual); if(G.obedit->type==OB_ARMATURE) selectconnected_armature(); else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) |