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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-09-27 15:24:55 +02:00
commit 4d2a69a932
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/Settings/MachineManager.py
View File

@ -665,7 +665,6 @@ class MachineManager(QObject):
# Find the values for each extruder.
for stack in ExtruderManager.getInstance().getActiveExtruderStacks():
# machine_definition = QualityManager.getInstance().getParentMachineDefinition(stack.getBottom())
material = stack.findContainer(type="material")
stack_qualities = QualityManager.getInstance().findQualityByName(quality_name, global_machine_definition, [material])
if not stack_qualities:

2
plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
View File

@ -94,7 +94,7 @@ class Profile:
config.set("general", "definition", "fdmprinter") #In this case, the machine definition is unknown, and it might now have machine-specific profiles, in which case this will fail.
config.add_section("metadata")
config.set("metadata", "quality", "normal") #This feature doesn't exist in 2.1 yet, so we don't know the actual quality type. For now, always base it on normal.
config.set("metadata", "quality_type", "normal") #This feature doesn't exist in 2.1 yet, so we don't know the actual quality type. For now, always base it on normal.
config.set("metadata", "type", "quality_changes")
if self._weight:
config.set("metadata", "weight", str(self._weight))