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

Merge branch '2.6'

Browse Source
This commit is contained in:
Lipu Fei 2017-06-13 15:06:37 +02:00
commit 0e09094a3d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Settings/ContainerManager.py
View File

@ -934,7 +934,9 @@ class ContainerManager(QObject):
whole_machine_definition = QualityManager.getInstance().getWholeMachineDefinition(machine_definition) whole_machine_definition = QualityManager.getInstance().getWholeMachineDefinition(machine_definition)
if whole_machine_definition.getMetaDataEntry("has_materials"): if whole_machine_definition.getMetaDataEntry("has_materials"):
quality_changes.addMetaDataEntry("material", quality_container.getMetaDataEntry("material")) material = quality_container.getMetaDataEntry("material")
if material is not None:
quality_changes.addMetaDataEntry("material", material)
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
quality_changes.addMetaDataEntry("setting_version", CuraApplication.SettingVersion) quality_changes.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)