Merge branch '2.3'

This commit is contained in:
Simon Edwards 2016-10-10 15:16:59 +02:00
commit 2f8163b843

View File

@ -189,7 +189,8 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
try:
product = UM.Dictionary.findKey(self.__product_id_map, definition_id)
except ValueError:
continue
# An unknown product id; export it anyway
product = definition_id
builder.start("machine")
builder.start("machine_identifier", { "manufacturer": definition.getMetaDataEntry("manufacturer", ""), "product": product})