GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-16 07:21:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-backup-manager

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Machines/MaterialManager.py
View File

@ -76,7 +76,9 @@ class MaterialManager(QObject):
def initialize(self): def initialize(self):
# Find all materials and put them in a matrix for quick search. # Find all materials and put them in a matrix for quick search.
material_metadatas = {metadata["id"]: metadata for metadata in self._container_registry.findContainersMetadata(type = "material")} material_metadatas = {metadata["id"]: metadata for metadata in
self._container_registry.findContainersMetadata(type = "material") if
metadata.get("GUID")}
self._material_group_map = dict() self._material_group_map = dict()

3
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -540,7 +540,8 @@ class XmlMaterialProfile(InstanceContainer):
validation_message = XmlMaterialValidator.validateMaterialMetaData(meta_data) validation_message = XmlMaterialValidator.validateMaterialMetaData(meta_data)
if validation_message is not None: 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 = {} property_values = {}
properties = data.iterfind("./um:properties/*", self.__namespaces) properties = data.iterfind("./um:properties/*", self.__namespaces)