Merge branch '3.2'

This commit is contained in:
Diego Prado Gesto 2018-01-19 13:50:30 +01:00
commit 0fbcd2d2ec
14 changed files with 179 additions and 128 deletions

View file

@ -279,6 +279,11 @@ class CuraApplication(QtApplication):
# We need them to simplify the switching between materials.
empty_container = ContainerRegistry.getInstance().getEmptyInstanceContainer()
empty_definition_changes_container = copy.deepcopy(empty_container)
empty_definition_changes_container.setMetaDataEntry("id", "empty_definition_changes")
empty_definition_changes_container.addMetaDataEntry("type", "definition_changes")
ContainerRegistry.getInstance().addContainer(empty_definition_changes_container)
empty_variant_container = copy.deepcopy(empty_container)
empty_variant_container.setMetaDataEntry("id", "empty_variant")
empty_variant_container.addMetaDataEntry("type", "variant")