From e138cdeeb637bb63f2a66728db1c3281ac1fca09 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 15 Dec 2016 11:12:43 +0100 Subject: Transform manipulator: Allow first clicking Shift before selecting axis Avoids possible jumps when one is trying to do some really preciese tweak. Quite striaghtforward change for mouse input initialization: take Shift state into account. However, this will interfere with the axis exclusion which is currently also uses Shift (the feature to move something in a plane which doesn't have selected axis). This is probably not so commonly used feature (nobody in the studio even knew of it) and the only downside now would be that such a constrainted movement will become accurate by default. That's easy to deal from user side by just unholding Shift key. Reviewers: brecht, mont29, Severin Differential Revision: https://developer.blender.org/D2418 --- source/blender/editors/transform/transform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/transform/transform.c') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 20c62e91d01..31ffa019e4e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -2176,7 +2176,7 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve calculateCenter(t); if (event) { - initMouseInput(t, &t->mouse, t->center2d, event->mval); + initMouseInput(t, &t->mouse, t->center2d, event->mval, event->shift); } switch (mode) { @@ -8495,7 +8495,7 @@ static void initTimeScale(TransInfo *t) center[1] = t->mouse.imval[1]; /* force a reinit with the center2d used here */ - initMouseInput(t, &t->mouse, center, t->mouse.imval); + initMouseInput(t, &t->mouse, center, t->mouse.imval, false); initMouseInputMode(t, &t->mouse, INPUT_SPRING_FLIP); -- cgit v1.2.3