Merge branch '4.0'

This commit is contained in:
Ghostkeeper 2019-03-18 11:24:23 +01:00
commit c79ffab9fb
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
5 changed files with 223 additions and 200 deletions

View file

@ -127,7 +127,7 @@ Item
{
text: catalog.i18nc("@action:button", "Remove")
iconName: "list-remove"
enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated
enabled: base.hasCurrentItem && !base.currentItem.is_read_only && !base.isCurrentItemActivated && base.materialManager.canMaterialBeRemoved(base.currentItem.container_node)
onClicked:
{
forceActiveFocus();