griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix:

Browse Source 
When transforming on one axis in a 2d-editor, it no longer mentions 'global' in the header print.

Un-related note: the mmb constraint selection in 2d-editors is currently quite wonky, as the current code for this only suits the 3d-view.
This commit is contained in:
Joshua Leung
2007-10-09 07:49:54 +00:00
parent f9535b4eb5
commit 088c3083a3
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/src/transform.c
View File

@@ -604,11 +604,11 @@ static void transformEvent(unsigned short event, short val) {
Trans.flag |= T_SHIFT_MOD;
Trans.redraw = 1;
break;
case SPACEKEY:
if ((Trans.spacetype==SPACE_VIEW3D) && (G.qual & LR_ALTKEY)) {
short mval[2];
getmouseco_sc(mval);
BIF_selectOrientation();
calc_manipulator_stats(curarea);
@@ -619,7 +619,7 @@ static void transformEvent(unsigned short event, short val) {
Trans.state = TRANS_CONFIRM;
}
break;
case MIDDLEMOUSE:
if ((Trans.flag & T_NO_CONSTRAINT)==0) {
@@ -723,10 +723,15 @@ static void transformEvent(unsigned short event, short val) {
}
}
else {
if (G.qual == 0)
setConstraint(&Trans, mati, (CON_AXIS0), "along global X");
else if ((G.qual == LR_SHIFTKEY) && ((Trans.flag & T_2D_EDIT)==0))
setConstraint(&Trans, mati, (CON_AXIS1|CON_AXIS2), "locking global X");
if (Trans.flag & T_2D_EDIT) {
setConstraint(&Trans, mati, (CON_AXIS0), "along X axis");
}
else {
if (G.qual == 0)
setConstraint(&Trans, mati, (CON_AXIS0), "along global X");
else if (G.qual == LR_SHIFTKEY)
setConstraint(&Trans, mati, (CON_AXIS1|CON_AXIS2), "locking global X");
}
}
Trans.redraw = 1;
}
@@ -750,10 +755,15 @@ static void transformEvent(unsigned short event, short val) {
}
}
else {
if (G.qual == 0)
setConstraint(&Trans, mati, (CON_AXIS1), "along global Y");
else if ((G.qual == LR_SHIFTKEY) && ((Trans.flag & T_2D_EDIT)==0))
setConstraint(&Trans, mati, (CON_AXIS0|CON_AXIS2), "locking global Y");
if (Trans.flag & T_2D_EDIT) {
setConstraint(&Trans, mati, (CON_AXIS1), "along Y axis");
}
else {
if (G.qual == 0)
setConstraint(&Trans, mati, (CON_AXIS1), "along global Y");
else if (G.qual == LR_SHIFTKEY)
setConstraint(&Trans, mati, (CON_AXIS0|CON_AXIS2), "locking global Y");
}
}
Trans.redraw = 1;
}