From 1febfde3cc30806962814a8e2f7efa2f8e9b80a6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Aug 2019 15:38:58 +0200 Subject: [PATCH] Fix switching to printers without variant Since the 'empty_variant' nozzle is now just in the tree, this check is no longer even necessary. Contributes to issue CURA-6600. --- cura/Machines/Models/BaseMaterialsModel.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index ec4c2dd4f6..1cf101e1ea 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -117,9 +117,7 @@ class BaseMaterialsModel(ListModel): # Update the available materials (ContainerNode) for the current active machine and extruder setup. global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() extruder_stack = global_stack.extruders[str(self._extruder_position)] - nozzle_name = None - if extruder_stack.variant.getId() != "empty_variant": - nozzle_name = extruder_stack.variant.getName() + nozzle_name = extruder_stack.variant.getName() materials = ContainerTree.getInstance().machines[global_stack.definition.getId()].variants[nozzle_name].materials compatible_material_diameter = str(round(extruder_stack.getCompatibleMaterialDiameter())) self._available_materials = {key: material for key, material in materials.items() if material.container.getMetaDataEntry("approximate_diameter") == compatible_material_diameter}