Revert "Transform: Use orientation of active object with Auto Constraint"

This reverts commit 54f248fa87afd4836fb7154056cd0e8d920401f1.

And fixes T84259.

Apparently the ideal behavior was the previous one.

1 files changed, 17 insertions, 26 deletions

diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index 54533bf43e5..3afd77ba8e4 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -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;