[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12243] trunk/blender/source/blender/src/ transform.c: Bugfix:
Joshua Leung
aligorith at gmail.com
Tue Oct 9 09:49:54 CEST 2007
Revision: 12243
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12243
Author: aligorith
Date: 2007-10-09 09:49:54 +0200 (Tue, 09 Oct 2007)
Log Message:
-----------
Bugfix:
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.
Modified Paths:
--------------
trunk/blender/source/blender/src/transform.c
Modified: trunk/blender/source/blender/src/transform.c
===================================================================
--- trunk/blender/source/blender/src/transform.c 2007-10-09 06:21:26 UTC (rev 12242)
+++ trunk/blender/source/blender/src/transform.c 2007-10-09 07:49:54 UTC (rev 12243)
@@ -604,11 +604,11 @@
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,8 +619,8 @@
Trans.state = TRANS_CONFIRM;
}
break;
-
+
case MIDDLEMOUSE:
if ((Trans.flag & T_NO_CONSTRAINT)==0) {
/* exception for switching to dolly, or trackball, in camera view */
@@ -723,10 +723,15 @@
}
}
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 @@
}
}
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;
}
More information about the Bf-blender-cvs
mailing list