Merge branch '4.2'

This commit is contained in:
Ghostkeeper 2019-07-22 17:32:21 +02:00
commit ca48f9171f
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276

View File

@ -1186,7 +1186,7 @@ class XmlMaterialProfile(InstanceContainer):
def __str__(self):
return "<XmlMaterialProfile '{my_id}' ('{name}') from base file '{base_file}'>".format(my_id = self.getId(), name = self.getName(), base_file = self.getMetaDataEntry("base_file"))
_metadata_tags_that_have_cura_namespace = ["pva_compatible", "breakaway_compatible"]
_metadata_tags_that_have_cura_namespace = {"pva_compatible", "breakaway_compatible"}
# Map XML file setting names to internal names
__material_settings_setting_map = {