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

This commit is contained in:
Jaime van Kessel 2016-10-06 13:50:18 +02:00
commit 39623ba2b8
10 changed files with 51 additions and 99 deletions

View file

@ -44,9 +44,6 @@ class QualityManager:
criteria = {"type": "quality_changes", "name": quality_changes_name}
result = self._getFilteredContainersForStack(machine_definition, [], **criteria)
criteria = {"type": "quality_changes", "global_profile": quality_changes_name}
result.extend(self._getFilteredContainersForStack(machine_definition, [], **criteria))
return result
## Fetch the list of available quality types for this combination of machine definition and materials.