3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-11-01 11:27:51 +01:00
commit 38a03e9a3c
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/QualityManager.py
View file

@ -27,7 +27,7 @@ class QualityManager:
# specified then the currently selected machine definition is used.
# \param material_containers (Optional) \type{List[ContainerInstance]} If nothing is specified then
# the current set of selected materials is used.
# \return the matching quality containers \type{List[ContainerInstance]}
# \return the matching quality container \type{ContainerInstance}
def findQualityByName(self, quality_name, machine_definition=None, material_containers=None):
criteria = {"type": "quality", "name": quality_name}
result = self._getFilteredContainersForStack(machine_definition, material_containers, **criteria)

1
resources/qml/Menus/MaterialMenu.qml
View file

@ -153,6 +153,7 @@ Menu
else
{
result.definition = "fdmprinter";
result.compatible = true; //NB: Only checks for compatibility in global version of material, but we don't have machine-specific materials anyway.
}
return result;
}

3
resources/qml/Preferences/MaterialsPage.qml
View file

@ -29,7 +29,8 @@ UM.ManagementPage
}
else
{
result.definition = "fdmprinter"
result.definition = "fdmprinter";
result.compatible = true; //NB: Only checks for compatibility in global version of material, but we don't have machine-specific materials anyway.
}
return result
}