From d93b137c954530fc14c6648ca7bb754b26afce21 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 10 Mar 2017 15:48:29 +0100 Subject: [PATCH 1/2] No longer add nodes that don't have children or MeshData CURA-3493 --- plugins/3MFReader/ThreeMFReader.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index 38e7130070..2aa6fb27d3 100644 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -92,7 +92,12 @@ class ThreeMFReader(MeshReader): um_node.setMeshData(mesh_data) for child in savitar_node.getChildren(): - um_node.addChild(self._convertSavitarNodeToUMNode(child)) + child_node = self._convertSavitarNodeToUMNode(child) + if child_node: + um_node.addChild(child_node) + + if um_node.getMeshData() is None and len(um_node.getChildren()) == 0: + return None settings = savitar_node.getSettings() @@ -152,6 +157,8 @@ class ThreeMFReader(MeshReader): self._unit = scene_3mf.getUnit() for node in scene_3mf.getSceneNodes(): um_node = self._convertSavitarNodeToUMNode(node) + if um_node is None: + continue # compensate for original center position, if object(s) is/are not around its zero position transform_matrix = Matrix() From b03ac3ea784b30ef18cec0f6cf2a559bd7535b1a Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 10 Mar 2017 15:59:47 +0100 Subject: [PATCH 2/2] JSON fix: skin angle for expansion is max angle; better description (CURA-3440) --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 3c9a946eef..f25899a065 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1318,10 +1318,10 @@ "enabled": "expand_upper_skins or expand_lower_skins", "settable_per_mesh": true }, - "min_skin_angle_for_expansion": + "max_skin_angle_for_expansion": { - "label": "Minimum Skin Angle for Expansion", - "description": "Top and or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope.", + "label": "Maximum Skin Angle for Expansion", + "description": "Top and or bottom surfaces of your object with an angle larger than this setting, won't have their top/bottom skin expanded. This avoids expanding the narrow skin areas that are created when the model surface has a near vertical slope. An angle of 0° is horizontal, while an angle of 90° is vertical.", "unit": "°", "type": "float", "minimum_value": "0",