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

Merge branch '3.3'

Browse source
This commit is contained in:
Ghostkeeper 2018-04-13 16:14:23 +02:00
commit 133f6f43fe
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
18 changed files with 74 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Machines/Models/GenericMaterialsModel.py
View file

@ -31,7 +31,6 @@ class GenericMaterialsModel(BaseMaterialsModel):
self.setItems([])
return
extruder_stack = global_stack.extruders[extruder_position]
exclude_materials = set(global_stack.definition.getMetaDataEntry("exclude_materials", []))
available_material_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack,
extruder_stack)
@ -42,9 +41,6 @@ class GenericMaterialsModel(BaseMaterialsModel):
item_list = []
for root_material_id, container_node in available_material_dict.items():
metadata = container_node.metadata
# Skip excluded materials
if metadata["id"] in exclude_materials:
continue
# Only add results for generic materials
if metadata["brand"].lower() != "generic":
continue