From 576294d30f42638232c09d73c041b4af64d15ce0 Mon Sep 17 00:00:00 2001
From: DeepSOIC <vv.titov@gmail.com>
Date: Fri, 1 Sep 2017 15:22:58 +0300
Subject: [PATCH] Part: Attacher: fix normal-to-path vertex usage, #3175

Modes affected:
* NormalToEdge ("Z tangent to edge", "Normal to edge"),
* Tangent

In these attachment modes, if vertex is linked first, the origin was
supposed to be placed on the vertex, but it was placed on the edge
instead, due to a bug. This commit fixes the bug.

Projects will be broken, which use above mentioned attachment modes, and
link Vertex as first reference, and the vertex does not lie on the edge.
To repair a project, edit the corresponding attachments, and swap the
order of references.
---
 src/Mod/Part/App/Attacher.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Mod/Part/App/Attacher.cpp b/src/Mod/Part/App/Attacher.cpp
index 614d90442d..71f3994bea 100644
--- a/src/Mod/Part/App/Attacher.cpp
+++ b/src/Mod/Part/App/Attacher.cpp
@@ -1221,6 +1221,13 @@ Base::Placement AttachEngine3D::calculateAttachedPlacement(Base::Placement origP
         if (d.Magnitude()<Precision::Confusion())
             throw Base::ValueError("AttachEngine3D::calculateAttachedPlacement: path curve derivative is below 1e-7, too low, can't align");
 
+        //Set origin. Note that it will be overridden later for mmConcentric and mmRevolutionSection
+        if (bThruVertex) {
+            SketchBasePoint = p_in;
+        } else {
+            SketchBasePoint = p;
+        }
+
         if (mmode == mmRevolutionSection
                 || mmode == mmConcentric
                 || mmode == mmFrenetNB
@@ -1247,12 +1254,6 @@ Base::Placement AttachEngine3D::calculateAttachedPlacement(Base::Placement origP
                 B = gp_Vec(0.,0.,0.);//redundant, just for consistency
             }
 
-            //Set origin. Note that it will be overridden later for mmConcentric and mmRevolutionSection
-            if (bThruVertex) {
-                SketchBasePoint = p_in;
-            } else {
-                SketchBasePoint = p;
-            }
 
             switch (mmode){
             case mmFrenetNB:
@@ -1289,7 +1290,6 @@ Base::Placement AttachEngine3D::calculateAttachedPlacement(Base::Placement origP
         } else if (mmode == mmNormalToPath){//mmNormalToPath
             //align sketch origin to the origin of support
             SketchNormal = gp_Dir(d.Reversed());//sketch normal looks at user. It is natural to have the curve directed away from user, so reversed.
-            SketchBasePoint = p;
         }
 
     } break;