From fd191b802ecd5cef3439683b015189dac9ffce88 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Thu, 3 Dec 2015 22:59:50 -0200
Subject: [PATCH] Draft: Fixed grid jump in edimode - fixes #2104

---
 src/Mod/Draft/DraftTools.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index e73e465fe5..f1afe09140 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -3425,7 +3425,8 @@ class Edit(Modifier):
                         self.running = True
                         plane.save()
                         if "Shape" in self.obj.PropertiesList:
-                            plane.alignToFace(self.obj.Shape)
+                            if plane.weak:
+                                plane.alignToFace(self.obj.Shape)
                         if self.planetrack:
                             self.planetrack.set(self.editpoints[0])
                     else:
@@ -3450,6 +3451,8 @@ class Edit(Modifier):
                 self.obj.ViewObject.Selectable = self.selectstate
         Modifier.finish(self)
         plane.restore()
+        if FreeCADGui.Snapper.grid:
+            FreeCADGui.Snapper.grid.set()
         self.running = False
         # following line causes crash
         # FreeCADGui.ActiveDocument.resetEdit()