Merge branch '2.4'

This commit is contained in:
Simon Edwards 2017-01-12 13:26:25 +01:00
commit 8d146d92b3
4 changed files with 86 additions and 86 deletions

View file

@ -220,6 +220,9 @@ class QualityManager:
material_ids = set()
for material_instance in material_containers:
if material_instance is not None:
# Add the parent material too.
for basic_material in self._getBasicMaterials(material_instance):
material_ids.add(basic_material.getId())
material_ids.add(material_instance.getId())
containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(**criteria)