blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Revert "Fix T96728: 'Automatic Constraint' using the wrong orientation" 

This reverts commit 6cc83f9079.

That commit removed the feature of cancel the 'Auto Constraint'
if it is enabled without drag.
This commit is contained in:
Germano Cavalcante 2022-03-23 12:25:32 -03:00
parent 6cc83f9079
commit 827e9ccb29
Notes: blender-bot 2023-02-14 08:07:50 +01:00 
Referenced by issue #96728, axis constrain in local mode only works the first time
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/transform/transform.c
View File

@ -845,6 +845,10 @@ int transformEvent(TransInfo *t, const wmEvent *event)
handled = true;
}
else if (event->type == MOUSEMOVE) {
if (t->modifiers & (MOD_CONSTRAINT_SELECT_AXIS | MOD_CONSTRAINT_SELECT_PLANE)) {
t->con.mode |= CON_SELECT;
}
copy_v2_v2_int(t->mval, event->mval);
/* Use this for soft redraw. Might cause flicker in object mode */
@ -1112,8 +1116,10 @@ int transformEvent(TransInfo *t, const wmEvent *event)
if (t->con.mode & CON_APPLY) {
stopConstraint(t);
}
initSelectConstraint(t);
else {
initSelectConstraint(t);
postSelectConstraint(t);
}
}
}
t->redraw |= TREDRAW_HARD;

13
source/blender/editors/transform/transform_constraints.c
View File

@ -984,7 +984,6 @@ void initSelectConstraint(TransInfo *t)
}
setUserConstraint(t, CON_APPLY | CON_SELECT, "%s");
selectConstraint(t);
}
void selectConstraint(TransInfo *t)
@ -997,7 +996,19 @@ void selectConstraint(TransInfo *t)
void postSelectConstraint(TransInfo *t)
{
if (!(t->con.mode & CON_SELECT)) {
return;
}
t->con.mode &= ~CON_AXIS0;
t->con.mode &= ~CON_AXIS1;
t->con.mode &= ~CON_AXIS2;
t->con.mode &= ~CON_SELECT;
setNearestAxis(t);
startConstraint(t);
t->redraw = TREDRAW_HARD;
}
static void setNearestAxis2d(TransInfo *t)