diff options
| author | Martin Poirier <theeth@yahoo.com> | 2005-10-02 23:31:32 +0400 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2005-10-02 23:31:32 +0400 |
| commit | 42fe4c568d2c393dcb016882a08a710ac3b11173 (patch) | |
| tree | 54a81ef1b9ae3588905f0a163a5861d51df3c90b | |
| parent | 90b5c5054c0d567558044eed4e52bef8ce809ee9 (diff) | |
Transform MMB behavior correction, as mentionned in meeting.
MMB uses global axis, Ctrl-MMB uses user defined. (Alt-MMB cause conflict with the window manager on linux)
(for hotkeys, first press is global, second press is user defined)
| -rwxr-xr-x | source/blender/src/transform.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index dbcc1743806..bb7510b15a2 100755 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -495,7 +495,10 @@ static void transformEvent(unsigned short event, short val) { stopConstraint(&Trans); } else { - initSelectConstraint(&Trans, Trans.spacemtx); + if (G.qual & LR_CTRLKEY) + initSelectConstraint(&Trans, Trans.spacemtx); + else + initSelectConstraint(&Trans, mati); postSelectConstraint(&Trans); } } @@ -793,9 +796,8 @@ void Transform() getmouseco_areawin(mval); if (mval[0] != pmval[0] || mval[1] != pmval[1]) { - if (Trans.flag & T_MMB_PRESSED) { - initSelectConstraint(&Trans, Trans.spacemtx); - } + if (Trans.flag & T_MMB_PRESSED) + Trans.con.mode |= CON_SELECT; Trans.redraw = 1; } if (Trans.redraw) { |