3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch '2.6'

Browse source
This commit is contained in:
Ghostkeeper 2017-05-29 15:56:02 +02:00
commit bbd852ceb7
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 4 additions and 2 deletions
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()