diff options
| -rwxr-xr-x | source/blender/src/transform_constraints.c | 6 | ||||
| -rw-r--r-- | source/blender/src/transform_manipulator.c | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c index f231813efd8..9f45410ab7b 100755 --- a/source/blender/src/transform_constraints.c +++ b/source/blender/src/transform_constraints.c @@ -742,13 +742,13 @@ void BIF_drawPropCircle() int isLockConstraint(TransInfo *t) { int mode = t->con.mode; - if (mode & (CON_AXIS0|CON_AXIS1) == (CON_AXIS0|CON_AXIS1)) + if ( (mode & (CON_AXIS0|CON_AXIS1)) == (CON_AXIS0|CON_AXIS1)) return 1; - if (mode & (CON_AXIS1|CON_AXIS2) == (CON_AXIS1|CON_AXIS2)) + if ( (mode & (CON_AXIS1|CON_AXIS2)) == (CON_AXIS1|CON_AXIS2)) return 1; - if (mode & (CON_AXIS0|CON_AXIS2) == (CON_AXIS0|CON_AXIS2)) + if ( (mode & (CON_AXIS0|CON_AXIS2)) == (CON_AXIS0|CON_AXIS2)) return 1; return 0; diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c index 9bd62e1f801..69822e2868e 100644 --- a/source/blender/src/transform_manipulator.c +++ b/source/blender/src/transform_manipulator.c @@ -1093,13 +1093,14 @@ static void draw_manipulator_translate(float mat[][4], int moving, int drawflags /* axis */ glLoadName(-1); - // translate drawn as last, only axis when no combo - if(combo==V3D_MANIP_TRANSLATE) + // translate drawn as last, only axis when no combo with scale, or for ghosting + if((combo & V3D_MANIP_SCALE)==0 || colcode==MAN_GHOST) draw_manipulator_axes(colcode, drawflags & MAN_TRANS_X, drawflags & MAN_TRANS_Y, drawflags & MAN_TRANS_Z); - /* offset in combo mode */ - if(combo & (V3D_MANIP_ROTATE|V3D_MANIP_SCALE)) dz= 1.0f+2.0*cylen; + /* offset in combo mode, for rotate a bit more */ + if(combo & (V3D_MANIP_ROTATE)) dz= 1.0f+2.0*cylen; + else if(combo & (V3D_MANIP_SCALE)) dz= 1.0f+0.5*cylen; else dz= 1.0f; /* Z Cone */ |