CURA-5334 factor out the need for material_diameter in machine definition for getDefaultMaterial

This commit is contained in:
Jack Ha 2018-06-12 11:25:02 +02:00
parent f775ce815d
commit 44e9d1e334
4 changed files with 15 additions and 10 deletions

View file

@ -72,12 +72,6 @@ class CuraStackBuilder:
)
new_global_stack.setName(generated_name)
# get material container for extruders
material_container = application.empty_material_container
material_node = material_manager.getDefaultMaterial(new_global_stack, extruder_variant_name)
if material_node and material_node.getContainer():
material_container = material_node.getContainer()
# Create ExtruderStacks
extruder_dict = machine_definition.getMetaDataEntry("machine_extruder_trains")
@ -90,6 +84,12 @@ class CuraStackBuilder:
ConfigurationErrorMessage.getInstance().addFaultyContainers(extruder_definition_id)
return None #Don't return any container stack then, not the rest of the extruders either.
# get material container for extruders
material_container = application.empty_material_container
material_node = material_manager.getDefaultMaterial(new_global_stack, position, extruder_variant_name, extruder_definition = extruder_definition)
if material_node and material_node.getContainer():
material_container = material_node.getContainer()
new_extruder_id = registry.uniqueName(extruder_definition_id)
new_extruder = cls.createExtruderStack(
new_extruder_id,