Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks

This commit is contained in:
Lipu Fei 2018-01-02 10:41:44 +01:00 committed by GitHub
commit 70d5d4415f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 10717 additions and 54 deletions

View file

@ -225,7 +225,7 @@ class CuraContainerRegistry(ContainerRegistry):
# This is assumed to be the global profile
profile_id = (global_container_stack.getBottom().getId() + "_" + name_seed).lower().replace(" ", "_")
elif len(machine_extruders) > profile_index:
elif profile_index < len(machine_extruders) + 1:
# This is assumed to be an extruder profile
extruder_id = Application.getInstance().getMachineManager().getQualityDefinitionId(machine_extruders[profile_index - 1].getBottom())
if not profile.getMetaDataEntry("extruder"):