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

Merge branch 'master' into feature_support_top_bottom_speed

Browse source
This commit is contained in:
Ghostkeeper 2017-04-10 10:52:31 +02:00
commit cb7c25f92f
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
180 changed files with 67911 additions and 67729 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/ExtruderManager.py
View file

@ -255,7 +255,12 @@ class ExtruderManager(QObject):
preferred_materials = container_registry.findInstanceContainers(**search_criteria)
if len(preferred_materials) >= 1:
material = preferred_materials[0]
# In some cases we get multiple materials. In that case, prefer materials that are marked as read only.
read_only_preferred_materials = [preferred_material for preferred_material in preferred_materials if preferred_material.isReadOnly()]
if len(read_only_preferred_materials) >= 1:
material = read_only_preferred_materials[0]
else:
material = preferred_materials[0]
else:
Logger.log("w", "The preferred material \"%s\" of machine %s doesn't exist or is not a material profile.", preferred_material_id, machine_id)
# And leave it at the default material.