3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.6'

Browse source
This commit is contained in:
Ghostkeeper 2017-05-31 17:17:32 +02:00
commit 2fb7821972
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/UltimakerMachineActions/UMOUpgradeSelection.py
View file

@ -52,7 +52,6 @@ class UMOUpgradeSelection(MachineAction):
definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion) definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().addContainer(definition_changes_container) UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().addContainer(definition_changes_container)
# Insert definition_changes between the definition and the variant global_container_stack.definitionChanges = definition_changes_container
global_container_stack.insertContainer(-1, definition_changes_container)
return definition_changes_container return definition_changes_container

2
resources/qml/SidebarHeader.qml
View file

@ -162,7 +162,7 @@ Column
Item Item
{ {
id: variantRow id: variantRow
height: UM.Theme.getSize("sidebar_setup").height height: UM.Theme.getSize("sidebar_setup").height
visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings