GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ghostkeeper 2017-05-29 15:55:08 +02:00
commit e0326bbb9b
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/Settings/CuraContainerRegistry.py
View File

@ -281,8 +281,10 @@ class CuraContainerRegistry(ContainerRegistry):
if self._machineHasOwnQualities():
profile.setDefinition(self._activeQualityDefinition())
if self._machineHasOwnMaterials():
profile.addMetaDataEntry("material", self._activeMaterialId())
quality_type_criteria["material"] = self._activeMaterialId()
active_material_id = self._activeMaterialId()
if active_material_id: # only update if there is an active material
profile.addMetaDataEntry("material", active_material_id)
quality_type_criteria["material"] = active_material_id
quality_type_criteria["definition"] = profile.getDefinition().getId()