From 7016e791c8681ca68b1691fced059609d0d385a4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 19 Sep 2019 15:33:19 +0200 Subject: [PATCH] Fix containertree for machines without materials but with specific qualities CURA-6775 --- cura/Machines/MaterialNode.py | 2 ++ resources/definitions/fdmprinter.def.json | 1 + 2 files changed, 3 insertions(+) diff --git a/cura/Machines/MaterialNode.py b/cura/Machines/MaterialNode.py index 988adeb830..08015ac72e 100644 --- a/cura/Machines/MaterialNode.py +++ b/cura/Machines/MaterialNode.py @@ -60,6 +60,8 @@ class MaterialNode(ContainerNode): # Find all quality profiles that fit on this material. if not self.variant.machine.has_machine_quality: # Need to find the global qualities. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = "fdmprinter") + elif not self.variant.machine.has_materials: + qualities = container_registry.findInstanceContainersMetadata(type="quality", definition=self.variant.machine.quality_definition) else: # Need to find the qualities that specify a material profile with the same material type. qualities = container_registry.findInstanceContainersMetadata(type = "quality", definition = self.variant.machine.quality_definition, variant = self.variant.variant_name, material = self.container_id) # First try by exact material ID. diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 570f2fc3e4..37ab4256ec 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -12,6 +12,7 @@ "visible": false, "has_materials": true, "has_variants": false, + "has_machine_quality": false, "preferred_material": "generic_pla", "preferred_quality_type": "normal", "machine_extruder_trains":