Merge branch '3.2'

This commit is contained in:
Ghostkeeper 2018-01-24 16:17:49 +01:00
commit ae40071ffd
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
5 changed files with 1866 additions and 2490 deletions

View file

@ -107,7 +107,7 @@ class SliceInfo(Extension):
"brand": extruder.material.getMetaData().get("brand", "")
}
extruder_position = int(extruder.getMetaDataEntry("position", "0"))
if extruder_position in print_information.materialLengths:
if len(print_information.materialLengths) > extruder_position:
extruder_dict["material_used"] = print_information.materialLengths[extruder_position]
extruder_dict["variant"] = extruder.variant.getName()
extruder_dict["nozzle_size"] = extruder.getProperty("machine_nozzle_size", "value")