3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

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

2
cura/Settings/MachineManager.py
View file

@ -1170,7 +1170,7 @@ class MachineManager(QObject):
context.context["evaluate_from_container_index"] = _ContainerIndexes.DefinitionChanges
material_diameter = extruder.getProperty("material_diameter", "value", context)
candidate_materials = self._material_manager.getAvailableMaterials(
self._global_container_stack.definition.getId(),
self._global_container_stack.definition,
current_variant_name,
material_diameter)