From 7d44c26b3802c70ea65ebc422feb1934b2a91395 Mon Sep 17 00:00:00 2001
From: Markus Lampert <markus@bibi.ca>
Date: Sat, 24 Jun 2017 23:51:13 -0700
Subject: [PATCH] Fixed deletion of dressup - clearing child object pointer
 prevents Tree from moving it to the root of the tree.

---
 src/Mod/Path/PathScripts/PathDressup.py            | 1 +
 src/Mod/Path/PathScripts/PathDressupDogbone.py     | 1 +
 src/Mod/Path/PathScripts/PathDressupDragknife.py   | 5 +++--
 src/Mod/Path/PathScripts/PathDressupHoldingTags.py | 1 +
 src/Mod/Path/PathScripts/PathDressupRampEntry.py   | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Path/PathScripts/PathDressup.py b/src/Mod/Path/PathScripts/PathDressup.py
index ca670b71f2..4efea66a82 100644
--- a/src/Mod/Path/PathScripts/PathDressup.py
+++ b/src/Mod/Path/PathScripts/PathDressup.py
@@ -95,6 +95,7 @@ class ViewProviderDressup:
         '''this makes sure that the base operation is added back to the project and visible'''
         FreeCADGui.ActiveDocument.getObject(arg1.Object.Base.Name).Visibility = True
         P.addToProject(arg1.Object.Base)
+        arg1.Object.Base = None
         return True
 
 class CommandPathDressup:
diff --git a/src/Mod/Path/PathScripts/PathDressupDogbone.py b/src/Mod/Path/PathScripts/PathDressupDogbone.py
index 1cc3068f40..13436a9038 100644
--- a/src/Mod/Path/PathScripts/PathDressupDogbone.py
+++ b/src/Mod/Path/PathScripts/PathDressupDogbone.py
@@ -975,6 +975,7 @@ class ViewProviderDressup:
         '''this makes sure that the base operation is added back to the project and visible'''
         FreeCADGui.ActiveDocument.getObject(arg1.Object.Base.Name).Visibility = True
         PathUtils.addToJob(arg1.Object.Base)
+        arg1.Object.Base = None
         return True
 
 class CommandDressupDogbone:
diff --git a/src/Mod/Path/PathScripts/PathDressupDragknife.py b/src/Mod/Path/PathScripts/PathDressupDragknife.py
index 85b73b5eb6..6b8e456981 100644
--- a/src/Mod/Path/PathScripts/PathDressupDragknife.py
+++ b/src/Mod/Path/PathScripts/PathDressupDragknife.py
@@ -30,7 +30,7 @@ import Path
 from PySide import QtCore, QtGui
 import math
 import DraftVecUtils as D
-import PathScripts.PathUtils as P
+import PathScripts.PathUtils as PathUtils
 
 """Dragknife Dressup object and FreeCAD command"""
 
@@ -458,7 +458,8 @@ class ViewProviderDressup:
 
     def onDelete(self, arg1=None, arg2=None):
         FreeCADGui.ActiveDocument.getObject(arg1.Object.Base.Name).Visibility = True
-        P.addToProject(arg1.Object.Base)
+        PathUtils.addToProject(arg1.Object.Base)
+        arg1.Object.Base = None
         return True
 
 
diff --git a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py
index 8d434e0ed5..8663606e74 100644
--- a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py
+++ b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py
@@ -1465,6 +1465,7 @@ class ViewProviderDressup:
             if obj:
                 obj.Visibility = True
         PathUtils.addToJob(arg1.Object.Base)
+        arg1.Object.Base = None
         return True
 
     def updateData(self, obj, propName):
diff --git a/src/Mod/Path/PathScripts/PathDressupRampEntry.py b/src/Mod/Path/PathScripts/PathDressupRampEntry.py
index 4acda9f19d..ff0b3a5e0f 100644
--- a/src/Mod/Path/PathScripts/PathDressupRampEntry.py
+++ b/src/Mod/Path/PathScripts/PathDressupRampEntry.py
@@ -564,6 +564,7 @@ class ViewProviderDressup:
         '''this makes sure that the base operation is added back to the project and visible'''
         FreeCADGui.ActiveDocument.getObject(arg1.Object.Base.Name).Visibility = True
         PathUtils.addToJob(arg1.Object.Base)
+        arg1.Object.Base = None
         return True
 
     def __getstate__(self):