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

Fix T96728: 'Automatic Constraint' using the wrong orientation

Browse Source 
If the `Automatic Constraint` modifier was activated while an axis
constraint was already set, the orientation used would be the default
orientation of the mode and not that of the scene.

This was because the `initSelectConstraint` function was not called in
this case and the `Automatic Constraint` mode was enabled by other
indirect means.

So the solution is to call `initSelectConstraint` in either case and
remove these "indirect means" of enabling `Automatic Constraint`.
This commit is contained in:
Germano Cavalcante
2022-03-28 14:21:33 -03:00
parent df4d6c22cf
commit 21e72496a6
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -843,10 +843,6 @@ 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 */
@@ -1095,6 +1091,7 @@ int transformEvent(TransInfo *t, const wmEvent *event)
/* Confirm. */
postSelectConstraint(t);
t->modifiers &= ~(MOD_CONSTRAINT_SELECT_AXIS | MOD_CONSTRAINT_SELECT_PLANE);
t->redraw = TREDRAW_HARD;
}
else {
if (t->options & CTX_CAMERA) {
@@ -1106,6 +1103,7 @@ int transformEvent(TransInfo *t, const wmEvent *event)
restoreTransObjects(t);
transform_mode_init(t, NULL, TFM_TRACKBALL);
}
t->redraw = TREDRAW_HARD;
}
else {
t->modifiers |= (event->val == TFM_MODAL_AUTOCONSTRAINT) ?
@@ -1114,13 +1112,13 @@ int transformEvent(TransInfo *t, const wmEvent *event)
if (t->con.mode & CON_APPLY) {
stopConstraint(t);
}
else {
initSelectConstraint(t);
postSelectConstraint(t);
}
initSelectConstraint(t);
/* Use #TREDRAW_SOFT so that #selectConstraint is only called on the next event.
* This allows us to "deselect" the contraint. */
t->redraw = TREDRAW_SOFT;
}
}
t->redraw |= TREDRAW_HARD;
handled = true;
}
break;

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

@@ -996,19 +996,10 @@ 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;
if (!(t->con.mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2))) {
t->con.mode &= ~CON_APPLY;
}
}
static void setNearestAxis2d(TransInfo *t)