From afe5f568626888cdc09bd919cea69c2a696d844e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 17 Jul 2017 11:44:54 +0200 Subject: [PATCH] If a default color is used, the layer view now correctly uses it. --- plugins/CuraEngineBackend/ProcessSlicedLayersJob.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py index 15cda75eb8..c5d7515e98 100644 --- a/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py +++ b/plugins/CuraEngineBackend/ProcessSlicedLayersJob.py @@ -24,6 +24,7 @@ from cura import LayerPolygon import numpy from time import time +from cura.Settings.ExtrudersModel import ExtrudersModel catalog = i18nCatalog("cura") @@ -174,7 +175,11 @@ class ProcessSlicedLayersJob(Job): material_color_map = numpy.zeros((len(extruders), 4), dtype=numpy.float32) for extruder in extruders: position = int(extruder.getMetaDataEntry("position", default="0")) # Get the position - color_code = extruder.material.getMetaDataEntry("color_code", default="#e0e000") + try: + default_color = ExtrudersModel.defaultColors[position] + except KeyError: + default_color = "#e0e000" + color_code = extruder.material.getMetaDataEntry("color_code", default=default_color) color = colorCodeToRGBA(color_code) material_color_map[position, :] = color else: