Merge branch 'master' into feature-backup-manager

* master:
  Do not load material when no GUID is present instead of crashing Cura
This commit is contained in:
ChrisTerBeke 2018-05-16 19:19:18 +02:00
commit 82207e2f6a
No known key found for this signature in database
GPG key ID: A49F1AB9D7E0C263
2 changed files with 7 additions and 4 deletions

View file

@ -540,7 +540,8 @@ class XmlMaterialProfile(InstanceContainer):
validation_message = XmlMaterialValidator.validateMaterialMetaData(meta_data)
if validation_message is not None:
raise Exception("Not valid material profile: %s" % (validation_message))
return
# raise Exception("Not valid material profile: %s" % (validation_message))
property_values = {}
properties = data.iterfind("./um:properties/*", self.__namespaces)