From 97f61366a83a24e0fa5c5664dc513e29b70bd5de Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 13 Nov 2017 16:51:07 +0100 Subject: [PATCH] CURA-4525 fix accidently remove all scenenodes when deleteAll --- cura/CuraApplication.py | 2 +- resources/qml/ObjectsList.qml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index de78f808cd..7667d6dad8 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1040,7 +1040,7 @@ class CuraApplication(QtApplication): nodes = [] for node in DepthFirstIterator(self.getController().getScene().getRoot()): - if not issubclass(type(node), SceneNode): + if type(node) not in {SceneNode, CuraSceneNode}: continue if (not node.getMeshData() and not node.callDecoration("getLayerData")) and not node.callDecoration("isGroup"): continue # Node that doesnt have a mesh and is not a group. diff --git a/resources/qml/ObjectsList.qml b/resources/qml/ObjectsList.qml index cde7f065fa..4eeb0cd568 100644 --- a/resources/qml/ObjectsList.qml +++ b/resources/qml/ObjectsList.qml @@ -54,7 +54,7 @@ Rectangle anchors.leftMargin: UM.Theme.getSize("default_margin").width //anchors.right: parent.right width: parent.width - 2 * UM.Theme.getSize("default_margin").width - 30 - text: Cura.ObjectManager.getItem(index).name; + text: Cura.ObjectManager.getItem(index) ? Cura.ObjectManager.getItem(index).name : ""; color: Cura.ObjectManager.getItem(index).isSelected ? palette.highlightedText : (Cura.ObjectManager.getItem(index).isOutsideBuildArea ? palette.mid : palette.text) elide: Text.ElideRight } @@ -66,7 +66,7 @@ Rectangle anchors.left: nodeNameLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.right: parent.right - text: Cura.ObjectManager.getItem(index).buildPlateNumber; + text: Cura.ObjectManager.getItem(index) ? Cura.ObjectManager.getItem(index).buildPlateNumber : 0; color: Cura.ObjectManager.getItem(index).isSelected ? palette.highlightedText : palette.text elide: Text.ElideRight }