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

CURA-4606 CURA-5003 fix saving material metadata when switching material; fix crashing on fallback material on materials without fallback

Browse source
This commit is contained in:
Jack Ha 2018-02-22 15:52:02 +01:00
parent b29d091b1d
commit c7499d6e17
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/Machines/MaterialManager.py
View file

@ -314,7 +314,8 @@ class MaterialManager(QObject):
def getFallbackMaterialId(self, material_type: str) -> str: def getFallbackMaterialId(self, material_type: str) -> str:
# For safety # For safety
if material_type not in self._fallback_materials_map: if material_type not in self._fallback_materials_map:
raise RuntimeError("Material type [%s] is not in the fallback materials table." % material_type) Logger.log("w", "The material type [%s] does not have a fallback material" % material_type)
return None
fallback_material = self._fallback_materials_map[material_type] fallback_material = self._fallback_materials_map[material_type]
if fallback_material: if fallback_material:
return self.getRootMaterialIDWithoutDiameter(fallback_material["id"]) return self.getRootMaterialIDWithoutDiameter(fallback_material["id"])

1
resources/qml/Preferences/MaterialsPage.qml
View file

@ -350,6 +350,7 @@ Item
onCurrentIndexChanged: onCurrentIndexChanged:
{ {
forceActiveFocus(); // causes the changed fields to be saved
var model = materialsModel.getItem(currentIndex); var model = materialsModel.getItem(currentIndex);
materialDetailsView.containerId = model.container_id; materialDetailsView.containerId = model.container_id;
materialDetailsView.currentMaterialNode = model.container_node; materialDetailsView.currentMaterialNode = model.container_node;