3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 15:25:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.2'

Browse source
This commit is contained in:
Jack Ha 2018-01-16 16:05:38 +01:00
commit 07f0906b1c
5 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/QualityManager.py
View file

@ -136,9 +136,6 @@ class QualityManager:
if basic_materials:
result = self._getFilteredContainersForStack(machine_definition, basic_materials, **criteria)
empty_quality = ContainerRegistry.getInstance().findInstanceContainers(id = "empty_quality")[0]
result.append(empty_quality)
return result
## Find all quality changes for a machine.

2
cura/Settings/ProfilesModel.py
View file

@ -87,7 +87,7 @@ class ProfilesModel(InstanceContainersModel):
if quality.getMetaDataEntry("quality_type") not in quality_type_set:
result.append(quality)
if len(result) > 1:
if len(result) > 1 and self._empty_quality in result:
result.remove(self._empty_quality)
return {item.getId(): item for item in result}, {} #Only return true profiles for now, no metadata. The quality manager is not able to get only metadata yet.