Fix resolving global stack definition when switching variant - CURA-4620

This commit is contained in:
ChrisTerBeke 2017-11-27 16:40:23 +01:00
parent 9e6704a162
commit 8cfaa44580

View file

@ -763,13 +763,14 @@ class MachineManager(QObject):
quality_type = old_quality_changes.getMetaDataEntry("quality_type") quality_type = old_quality_changes.getMetaDataEntry("quality_type")
new_quality_id = old_quality_changes.getId() new_quality_id = old_quality_changes.getId()
# See if the requested quality type is available in the new situation. global_stack = Application.getInstance().getGlobalContainerStack()
machine_definition = self._active_container_stack.getBottom() if global_stack:
quality_manager = QualityManager.getInstance() quality_manager = QualityManager.getInstance()
candidate_quality = None candidate_quality = None
if quality_type: if quality_type:
candidate_quality = quality_manager.findQualityByQualityType(quality_type, candidate_quality = quality_manager.findQualityByQualityType(quality_type,
quality_manager.getWholeMachineDefinition(material_container.getDefinition()), quality_manager.getWholeMachineDefinition(global_stack.definition),
[material_container]) [material_container])
if not candidate_quality or isinstance(candidate_quality, type(self._empty_quality_changes_container)): if not candidate_quality or isinstance(candidate_quality, type(self._empty_quality_changes_container)):