Revert "Transform: Use orientation of active object with Auto Constraint"
This reverts commit 54f248fa87
.
And fixes T84259.
Apparently the ideal behavior was the previous one.
This commit is contained in:
parent
fc5f9a8ac9
commit
736b0d6894
Notes:
blender-bot
2023-10-13 01:54:23 +02:00
Referenced by issue #84259, "active element" works correctly only when the axis is picked with middle mouse button.
|
@ -703,34 +703,25 @@ void setUserConstraint(TransInfo *t, int mode, const char ftext[])
|
|||
const char *spacename = transform_orientations_spacename_get(t, orientation);
|
||||
BLI_snprintf(text, sizeof(text), ftext, spacename);
|
||||
|
||||
if (t->modifiers & (MOD_CONSTRAINT_SELECT | MOD_CONSTRAINT_PLANE)) {
|
||||
/* Force the orientation of the active object.
|
||||
* Although possible, it is not convenient to use the local or axis constraint
|
||||
* with the modifier to select constraint.
|
||||
* This also follows the convention of older versions. */
|
||||
setConstraint(t, mode, text);
|
||||
}
|
||||
else {
|
||||
switch (orientation) {
|
||||
case V3D_ORIENT_LOCAL:
|
||||
setLocalConstraint(t, mode, text);
|
||||
break;
|
||||
case V3D_ORIENT_NORMAL:
|
||||
if (checkUseAxisMatrix(t)) {
|
||||
setAxisMatrixConstraint(t, mode, text);
|
||||
break;
|
||||
}
|
||||
ATTR_FALLTHROUGH;
|
||||
case V3D_ORIENT_GLOBAL:
|
||||
case V3D_ORIENT_VIEW:
|
||||
case V3D_ORIENT_CURSOR:
|
||||
case V3D_ORIENT_GIMBAL:
|
||||
case V3D_ORIENT_CUSTOM_MATRIX:
|
||||
case V3D_ORIENT_CUSTOM:
|
||||
default: {
|
||||
setConstraint(t, mode, text);
|
||||
switch (orientation) {
|
||||
case V3D_ORIENT_LOCAL:
|
||||
setLocalConstraint(t, mode, text);
|
||||
break;
|
||||
case V3D_ORIENT_NORMAL:
|
||||
if (checkUseAxisMatrix(t)) {
|
||||
setAxisMatrixConstraint(t, mode, text);
|
||||
break;
|
||||
}
|
||||
ATTR_FALLTHROUGH;
|
||||
case V3D_ORIENT_GLOBAL:
|
||||
case V3D_ORIENT_VIEW:
|
||||
case V3D_ORIENT_CURSOR:
|
||||
case V3D_ORIENT_GIMBAL:
|
||||
case V3D_ORIENT_CUSTOM_MATRIX:
|
||||
case V3D_ORIENT_CUSTOM:
|
||||
default: {
|
||||
setConstraint(t, mode, text);
|
||||
break;
|
||||
}
|
||||
}
|
||||
t->con.mode |= CON_USER;
|
||||
|
|
Loading…
Reference in New Issue