[Bf-blender-cvs] [eb68cd713b1] master: Fix T81465: Snapping to edge center doesn't work as expected when using axis locking

[Germano Cavalcante]

Commit: eb68cd713b151d97394cd9c9d12d9ee8148970ec
Author: Germano Cavalcante
Date:   Tue Oct 6 16:19:22 2020 -0300
Branches: master
https://developer.blender.org/rBeb68cd713b151d97394cd9c9d12d9ee8148970ec

Fix T81465: Snapping to edge center doesn't work as expected when using axis locking

The result was being affected by the view alignment correction.

Regression introduced in rB4eda60c2d82d

===================================================================

M	source/blender/editors/transform/transform_constraints.c

===================================================================

diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index 9cb8d97393a..ac27f2cd7aa 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -384,9 +384,9 @@ static void applyAxisConstraintVec(
 
     if (activeSnap(t)) {
       if (validSnap(t)) {
-        is_snap_to_point = (t->tsnap.snapElem & SCE_SNAP_MODE_VERTEX) != 0;
         is_snap_to_edge = (t->tsnap.snapElem & SCE_SNAP_MODE_EDGE) != 0;
         is_snap_to_face = (t->tsnap.snapElem & SCE_SNAP_MODE_FACE) != 0;
+        is_snap_to_point = !is_snap_to_edge && !is_snap_to_face;
       }
       else if (t->tsnap.snapElem & SCE_SNAP_MODE_GRID) {
         is_snap_to_point = true;