diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-03-22 18:01:36 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-03-22 18:01:36 +0300 |
| commit | 1a4138e1845d8910bea9906f51e4d76ab4a82625 (patch) | |
| tree | 564c4bba73360a78cf25079d5d44426a0a1edac4 /source/blender/src/transform_manipulator.c | |
| parent | 1f203ac7f1edac3f434f2d8f3ee625fa38e7e807 (diff) | |
- Removed temporal hack that switched manipulator type on G, R, S hotkeys.
That was blocking immediate hotkey access for normal blendering.
- New, experimental, hotkey to switch: CTRLKEY! Added code in such a way
it detects a CTRL key press and release without using it as modifier.
Pressing CTRL will cycle through the 3 manipulator types.
- Fix for yesterday's commit; click on centerpoint for switching
orientation happened too on a click for other widgets. Not nice...
Diffstat (limited to 'source/blender/src/transform_manipulator.c')
| -rw-r--r-- | source/blender/src/transform_manipulator.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c index b3a127be625..b01533aebc6 100644 --- a/source/blender/src/transform_manipulator.c +++ b/source/blender/src/transform_manipulator.c @@ -1384,15 +1384,17 @@ int BIF_do_manipulator(ScrArea *sa) /* cycling orientation modus */ getmouseco_areawin(mval); - if(mvalo[0]==mval[0] && mvalo[1]==mval[1]) { - if(v3d->twmode==V3D_MANIPULATOR_GLOBAL) - v3d->twmode= V3D_MANIPULATOR_LOCAL; - else if(v3d->twmode==V3D_MANIPULATOR_LOCAL) - if(G.obedit || G.obpose) v3d->twmode= V3D_MANIPULATOR_NORMAL; - else v3d->twmode= V3D_MANIPULATOR_GLOBAL; - else if(v3d->twmode==V3D_MANIPULATOR_NORMAL) - v3d->twmode= V3D_MANIPULATOR_GLOBAL; - + if(val==MAN_ROT_V || val==MAN_SCALE_C || val==MAN_TRANS_C) { + if(mvalo[0]==mval[0] && mvalo[1]==mval[1]) { + if(v3d->twmode==V3D_MANIPULATOR_GLOBAL) + v3d->twmode= V3D_MANIPULATOR_LOCAL; + else if(v3d->twmode==V3D_MANIPULATOR_LOCAL) + if(G.obedit || G.obpose) v3d->twmode= V3D_MANIPULATOR_NORMAL; + else v3d->twmode= V3D_MANIPULATOR_GLOBAL; + else if(v3d->twmode==V3D_MANIPULATOR_NORMAL) + v3d->twmode= V3D_MANIPULATOR_GLOBAL; + + } } } |