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

This commit is contained in:
Lipu Fei 2018-08-14 12:02:23 +02:00
commit 746644e6ed

View File

@ -533,6 +533,7 @@ Column
rightMargin: UM.Theme.getSize("sidebar_margin").width
}
// TODO This was added to replace the buildplate selector. Remove this component when the feature is ready
Label
{
id: materialCompatibilityLabel
@ -542,7 +543,7 @@ Column
text: catalog.i18nc("@label", "Use glue with this material combination")
font: UM.Theme.getFont("very_small")
color: UM.Theme.getColor("text")
visible: buildplateCompatibilityError || buildplateCompatibilityWarning
visible: CuraSDKVersion == "dev" ? false : buildplateCompatibilityError || buildplateCompatibilityWarning
wrapMode: Text.WordWrap
opacity: 0.5
}