Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite

This commit is contained in:
Jaime van Kessel 2017-11-27 13:43:39 +01:00
commit 083eee2e9d
22 changed files with 129 additions and 80 deletions

View file

@ -769,9 +769,10 @@ class MachineManager(QObject):
candidate_quality = None
if quality_type:
candidate_quality = quality_manager.findQualityByQualityType(quality_type,
quality_manager.getWholeMachineDefinition(machine_definition),
quality_manager.getWholeMachineDefinition(material_container.getDefinition()),
[material_container])
if not candidate_quality or isinstance(candidate_quality, type(self._empty_quality_changes_container)):
Logger.log("d", "Attempting to find fallback quality")
# Fall back to a quality (which must be compatible with all other extruders)