Merge branch '3.5' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2018-09-11 11:01:55 +02:00
commit c84a2213a7
4 changed files with 82 additions and 74 deletions

View file

@ -204,6 +204,9 @@ class QualityManager(QObject):
def getQualityGroups(self, machine: "GlobalStack") -> Dict[str, QualityGroup]:
machine_definition_id = getMachineDefinitionIDForQualitySearch(machine.definition)
# This determines if we should only get the global qualities for the global stack and skip the global qualities for the extruder stacks
has_machine_specific_qualities = machine.getHasMachineQuality()
# To find the quality container for the GlobalStack, check in the following fall-back manner:
# (1) the machine-specific node
# (2) the generic node