3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all

Browse source 
CURA-5334 Add extruder definitions for all single-extrusion machines
This commit is contained in:
alekseisasin 2018-07-02 15:56:45 +02:00 • committed by GitHub
commit debe142c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
219 changed files with 2003 additions and 541 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/MachineManager.py
View file

@ -1279,7 +1279,7 @@ class MachineManager(QObject):
continue
# The current material is not available, find the preferred one
material_node = self._material_manager.getDefaultMaterial(self._global_container_stack, current_variant_name)
material_node = self._material_manager.getDefaultMaterial(self._global_container_stack, position, current_variant_name)
if material_node is not None:
self._setMaterial(position_item, material_node)
@ -1321,7 +1321,7 @@ class MachineManager(QObject):
for extruder_configuration in configuration.extruderConfigurations:
position = str(extruder_configuration.position)
variant_container_node = self._variant_manager.getVariantNode(self._global_container_stack.definition.getId(), extruder_configuration.hotendID)
material_container_node = self._material_manager.getMaterialNodeByType(self._global_container_stack, extruder_configuration.hotendID,extruder_configuration.material.guid)
material_container_node = self._material_manager.getMaterialNodeByType(self._global_container_stack, position, extruder_configuration.hotendID, extruder_configuration.material.guid)
if variant_container_node:
self._setVariantNode(position, variant_container_node)
else: