Filter available materials by the machine definition

Since we now have some machine-specific materials
This commit is contained in:
Arjen Hiemstra 2016-05-25 11:28:29 +02:00
parent 2654033fae
commit b2a8810d04
2 changed files with 2 additions and 2 deletions

View File

@ -13,7 +13,7 @@ UM.ManagementPage
title: catalog.i18nc("@title:tab", "Materials"); title: catalog.i18nc("@title:tab", "Materials");
model: UM.InstanceContainersModel { filter: { "type": "material" } } model: UM.InstanceContainersModel { filter: { "type": "material", "definition": Cura.MachineManager.activeDefinitionId } }
/* /*
onAddObject: { var selectedMaterial = UM.MaterialManager.createProfile(); base.selectMaterial(selectedMaterial); } onAddObject: { var selectedMaterial = UM.MaterialManager.createProfile(); base.selectMaterial(selectedMaterial); }
onRemoveObject: confirmDialog.open(); onRemoveObject: confirmDialog.open();

View File

@ -197,7 +197,7 @@ Item
id: materialSelectionInstantiator id: materialSelectionInstantiator
model: UM.InstanceContainersModel model: UM.InstanceContainersModel
{ {
filter: {"type": "material"} filter: { "type": "material", "definition": Cura.MachineManager.activeDefinitionId }
} }
MenuItem MenuItem
{ {