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

This commit is contained in:
Jaime van Kessel 2019-01-18 11:19:28 +01:00
commit a51289d7ce

View file

@ -83,7 +83,7 @@ Item
{ {
text: catalog.i18nc("@action:button", "Activate") text: catalog.i18nc("@action:button", "Activate")
iconName: "list-activate" iconName: "list-activate"
enabled: !isCurrentItemActivated enabled: !isCurrentItemActivated && Cura.MachineManager.hasMaterials
onClicked: onClicked:
{ {
forceActiveFocus() forceActiveFocus()