Merge branch 'master' into blender-projects-basicsblender-projects-basics

1 files changed, 6 insertions, 9 deletions

diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index fa56456d8e7..7abf0e5c00c 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -404,9 +404,11 @@ static void applyAxisConstraintVec(const TransInfo *t,
       }
     }
 
+    /* Fallback for when axes are aligned. */
+    mul_m3_v3(t->con.pmtx, out);
+
     if (is_snap_to_point) {
-      /* With snap points, a projection is alright, no adjustments needed. */
-      mul_m3_v3(t->con.pmtx, out);
+      /* Pass. With snap points, a projection is alright, no adjustments needed. */
     }
     else {
       const int dims = getConstraintSpaceDimension(t);
@@ -422,14 +424,9 @@ static void applyAxisConstraintVec(const TransInfo *t,
             /* Disabled, as it has not proven to be really useful. (See T82386). */
             // constraint_snap_plane_to_face(t, plane, out);
           }
-          else {
+          else if (!isPlaneProjectionViewAligned(t, plane)) {
             /* View alignment correction. */
-            if (!isPlaneProjectionViewAligned(t, plane)) {
-              planeProjection(t, plane, in, out);
-            }
-            else {
-              mul_m3_v3(t->con.pmtx, out);
-            }
+            planeProjection(t, plane, in, out);
           }
         }
       }