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

Fix quality search with material base_file

Browse Source 
CURA-7070
This commit is contained in:
Lipu Fei 2019-12-18 15:39:09 +01:00
parent 4b313c2dac
commit 6c9b8f992f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/Machines/MaterialNode.py
View File

@ -71,11 +71,14 @@ class MaterialNode(ContainerNode):
qualities = container_registry.findInstanceContainersMetadata(type = "quality", qualities = container_registry.findInstanceContainersMetadata(type = "quality",
definition = self.variant.machine.quality_definition, definition = self.variant.machine.quality_definition,
variant = self.variant.variant_name, variant = self.variant.variant_name,
material = self.container_id) material = self.base_file) # First try by exact material ID.
# CURA-7070
# The quality profiles only reference a material with the material_root_id. They will never state something
# such as "generic_pla_ultimaker_s5_AA_0.4". So we search with the "base_file" which is the material_root_id.
else: else:
qualities = container_registry.findInstanceContainersMetadata(type = "quality", qualities = container_registry.findInstanceContainersMetadata(type = "quality",
definition = self.variant.machine.quality_definition, definition = self.variant.machine.quality_definition,
material = self.container_id) material = self.base_file)
if not qualities: if not qualities:
my_material_type = self.material_type my_material_type = self.material_type
if self.variant.machine.has_variants: if self.variant.machine.has_variants: