archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- Removed temporal hack that switched manipulator type on G, R, S hotkeys.

Browse Source 
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...
This commit is contained in:
Ton Roosendaal
2005-03-22 15:01:36 +00:00
parent 1f203ac7f1
commit 1a4138e184
3 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/src/transform_manipulator.c
View File

@@ -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;
}
}
}