Merge pull request #6338 from Ultimaker/feature_intent_upgrade

Feature intent upgrade
This commit is contained in:
Lipu Fei 2019-09-19 14:44:52 +02:00 committed by GitHub
commit a3263da3f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1137 changed files with 1321 additions and 1148 deletions

View file

@ -1322,9 +1322,10 @@ class MachineManager(QObject):
self._setMaterial(position_item, new_material)
else:
# The current material is not available, find the preferred one.
approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter())
material_node = nozzle_node.preferredMaterial(approximate_material_diameter)
self._setMaterial(position_item, material_node)
if position is not None:
approximate_material_diameter = int(self._global_container_stack.extruderList[int(position)].getApproximateMaterialDiameter())
material_node = nozzle_node.preferredMaterial(approximate_material_diameter)
self._setMaterial(position_item, material_node)
## Given a printer definition name, select the right machine instance. In case it doesn't exist, create a new
# instance with the same network key.