Fixed deletion of dressup - clearing child object pointer prevents Tr…

…ee from moving it to the root of the tree.
FreeCAD · Jun 26, 2017 · 7d44c26 · 7d44c26
1 parent 7773d30
commit 7d44c26
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/src/Mod/Path/PathScripts/PathDressup.py b/src/Mod/Path/PathScripts/PathDressup.py
@@ -95,6 +95,7 @@ def onDelete(self, arg1=None, arg2=None):
         '''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
@@ -975,6 +975,7 @@ def onDelete(self, arg1=None, arg2=None):
         '''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
@@ -30,7 +30,7 @@
 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 @@ def __setstate__(self, state):
 
     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
@@ -1465,6 +1465,7 @@ def onDelete(self, arg1=None, arg2=None):
             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
@@ -564,6 +564,7 @@ def onDelete(self, arg1=None, arg2=None):
         '''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):