GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3'

Browse Source
This commit is contained in:
Ghostkeeper 2016-10-31 17:26:51 +01:00
commit 0fa93f2214
3 changed files with 4 additions and 2 deletions
Show Stats 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. # specified then the currently selected machine definition is used.
# \param material_containers (Optional) \type{List[ContainerInstance]} If nothing is specified then # \param material_containers (Optional) \type{List[ContainerInstance]} If nothing is specified then
# the current set of selected materials is used. # 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): def findQualityByName(self, quality_name, machine_definition=None, material_containers=None):
criteria = {"type": "quality", "name": quality_name} criteria = {"type": "quality", "name": quality_name}
result = self._getFilteredContainersForStack(machine_definition, material_containers, **criteria) result = self._getFilteredContainersForStack(machine_definition, material_containers, **criteria)

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

@ -153,6 +153,7 @@ Menu
else 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; return result;
} }

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

@ -29,7 +29,8 @@ UM.ManagementPage
} }
else 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 return result
} }