Fix logic and typo for material container filtering

CURA-491
This commit is contained in:
fieldOfView 2016-07-04 13:43:13 +02:00
parent 8e58e88511
commit 24c5a39962

View file

@ -107,12 +107,11 @@ class MachineManagerModel(QObject):
if not self._global_container_stack: if not self._global_container_stack:
return return
definition_id = "fdmprinter"
if self._global_container_stack.getMetaDataEntry("has_machine_materials", False): if self._global_container_stack.getMetaDataEntry("has_machine_materials", False):
definition_id = "fdmprinter"
else:
definition_id = self._global_container_stack.getBottom().getId() definition_id = self._global_container_stack.getBottom().getId()
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", defintion = definition_id, GUID = material_id) containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(type = "material", definition = definition_id, GUID = material_id)
if containers: if containers:
ExtruderManager.ExtruderManager.getInstance().setActiveExtruderIndex(index) ExtruderManager.ExtruderManager.getInstance().setActiveExtruderIndex(index)
Logger.log("d", "Setting material of hotend %d to %s" % (index, containers[0].getId())) Logger.log("d", "Setting material of hotend %d to %s" % (index, containers[0].getId()))