GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 12:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Undo removing object from group now works correctly

Browse Source 
CURA-1891
This commit is contained in:
Jaime van Kessel 2016-07-29 11:05:11 +02:00
parent 21d4e9b894
commit 03aa4f9c6a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/CuraApplication.py
View File

@ -565,8 +565,7 @@ class CuraApplication(QtApplication):
remaining_nodes_in_group = list(set(group_node.getChildren()) - set(nodes)) remaining_nodes_in_group = list(set(group_node.getChildren()) - set(nodes))
if len(remaining_nodes_in_group) == 1: if len(remaining_nodes_in_group) == 1:
removed_group_nodes.append(group_node) removed_group_nodes.append(group_node)
remaining_nodes_in_group[0].translate(group_node.getPosition()) op.addOperation(SetParentOperation(remaining_nodes_in_group[0], group_node.getParent()))
remaining_nodes_in_group[0].setParent(group_node.getParent())
op.addOperation(RemoveSceneNodeOperation(group_node)) op.addOperation(RemoveSceneNodeOperation(group_node))
op.push() op.push()
@ -593,8 +592,7 @@ class CuraApplication(QtApplication):
op.push() op.push()
if group_node: if group_node:
if len(group_node.getChildren()) == 1 and group_node.callDecoration("isGroup"): if len(group_node.getChildren()) == 1 and group_node.callDecoration("isGroup"):
group_node.getChildren()[0].translate(group_node.getPosition()) op.addOperation(SetParentOperation(group_node.getChildren()[0], group_node.getParent()))
group_node.getChildren()[0].setParent(group_node.getParent())
op = RemoveSceneNodeOperation(group_node) op = RemoveSceneNodeOperation(group_node)
op.push() op.push()