Merge branch 'feature_intent' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2019-10-08 16:23:03 +02:00
commit 987ccd28ba
No known key found for this signature in database
GPG key ID: 3710727397403C91
4 changed files with 11 additions and 7 deletions

View file

@ -627,13 +627,7 @@ class MachineManager(QObject):
if not global_container_stack:
return ""
intent_category = "default"
for extruder in global_container_stack.extruderList:
category = extruder.intent.getMetaDataEntry("intent_category", "default")
if category != "default" and category != intent_category:
intent_category = category
return intent_category
return global_container_stack.getIntentCategory()
# Provies a list of extruder positions that have a different intent from the active one.
@pyqtProperty("QStringList", notify=activeIntentChanged)