3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 18:57:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix deleting grouped object using the context-menu

Browse source 
CURA-2573
This commit is contained in:
fieldOfView 2016-10-10 17:48:00 +02:00
parent b4a2a0a417
commit 879ab529f2
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cura/CuraApplication.py
View file

@ -646,8 +646,6 @@ class CuraApplication(QtApplication):
op.addOperation(RemoveSceneNodeOperation(group_node)) op.addOperation(RemoveSceneNodeOperation(group_node))
op.push() op.push()
pass
## Remove an object from the scene. ## Remove an object from the scene.
# Note that this only removes an object if it is selected. # Note that this only removes an object if it is selected.
@pyqtSlot("quint64") @pyqtSlot("quint64")
@ -661,17 +659,17 @@ class CuraApplication(QtApplication):
node = Selection.getSelectedObject(0) node = Selection.getSelectedObject(0)
if node: if node:
group_node = None op = GroupedOperation()
if node.getParent(): op.addOperation(RemoveSceneNodeOperation(node))
group_node = node.getParent()
op = RemoveSceneNodeOperation(node) group_node = node.getParent()
if group_node:
# Note that at this point the node has not yet been deleted
if len(group_node.getChildren()) <= 2 and group_node.callDecoration("isGroup"):
op.addOperation(SetParentOperation(group_node.getChildren()[0], group_node.getParent()))
op.addOperation(RemoveSceneNodeOperation(group_node))
op.push() op.push()
if group_node:
if len(group_node.getChildren()) == 1 and group_node.callDecoration("isGroup"):
op.addOperation(SetParentOperation(group_node.getChildren()[0], group_node.getParent()))
op = RemoveSceneNodeOperation(group_node)
op.push()
## Create a number of copies of existing object. ## Create a number of copies of existing object.
@pyqtSlot("quint64", int) @pyqtSlot("quint64", int)