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

This commit is contained in:
Jaime van Kessel 2016-10-12 17:50:12 +02:00
commit 939ed60808
6 changed files with 17 additions and 18 deletions

View file

@ -117,11 +117,7 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
quality_container = quality_container[0]
quality_type = quality_container.getMetaDataEntry("quality_type")
definition = quality_container.getDefinition()
if definition:
definition_id = definition.getId()
else:
definition_id = "empty_quality"
definition_id = quality_container.getDefinition().getId()
criteria = {"type": "quality", "quality_type": quality_type, "definition": definition_id}