mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 23:46:22 -06:00
Revert "fix merge conflict"
This reverts commitec03b012a7
, reversing changes made to2af33738d1
.
This commit is contained in:
parent
3ebefa4f8a
commit
4bffa6d90f
73 changed files with 1223 additions and 3054 deletions
|
@ -195,7 +195,7 @@ class ProcessSlicedLayersJob(Job):
|
|||
if extruders:
|
||||
material_color_map = numpy.zeros((len(extruders), 4), dtype=numpy.float32)
|
||||
for extruder in extruders:
|
||||
position = int(extruder.getMetaDataEntry("position", default = "0"))
|
||||
position = int(extruder.getMetaDataEntry("position", default="0")) # Get the position
|
||||
try:
|
||||
default_color = ExtrudersModel.defaultColors[position]
|
||||
except IndexError:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue