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

This commit is contained in:
Jaime van Kessel 2017-02-20 09:58:24 +01:00
commit 88bbadead8

View file

@ -161,11 +161,11 @@ Item
{
id: layerViewTypes
ListElement {
text: catalog.i18nc("@label", "Material Color")
text: "Material Color"
type_id: 0
}
ListElement {
text: catalog.i18nc("@label", "Line Type")
text: "Line Type"
type_id: 1 // these ids match the switching in the shader
}
}