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

Merge branch '2.6' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2017-06-12 15:25:35 +02:00
commit df67ae18f1
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/Settings/ContainerManager.py
View file

@ -929,6 +929,11 @@ class ContainerManager(QObject):
quality_changes.setDefinition(self._container_registry.findContainers(id = "fdmprinter")[0])
else:
quality_changes.setDefinition(QualityManager.getInstance().getParentMachineDefinition(machine_definition))
whole_machine_definition = QualityManager.getInstance().getWholeMachineDefinition(machine_definition)
if whole_machine_definition.getMetaDataEntry("has_materials"):
quality_changes.addMetaDataEntry("material", quality_container.getMetaDataEntry("material"))
from cura.CuraApplication import CuraApplication
quality_changes.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
return quality_changes

3
cura/Settings/MachineManager.py
View file

@ -753,11 +753,12 @@ class MachineManager(QObject):
candidate_quality = quality_manager.findQualityByQualityType(quality_type,
quality_manager.getWholeMachineDefinition(machine_definition),
[material_container])
if not candidate_quality or isinstance(candidate_quality, type(self._empty_quality_changes_container)):
Logger.log("d", "Attempting to find fallback quality")
# Fall back to a quality (which must be compatible with all other extruders)
new_qualities = quality_manager.findAllUsableQualitiesForMachineAndExtruders(
self._global_container_stack, ExtruderManager.getInstance().getExtruderStacks())
if new_qualities:
new_quality_id = new_qualities[0].getId() # Just pick the first available one
else: