From d593257fbd9ab0058fcb975b33b8dc55eb1f8f8d Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 4 Sep 2023 14:16:32 +0100
Subject: [PATCH] Honour override-individual-item-colors setting for filled
 shapes.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15572
---
 eeschema/sch_painter.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 282e147664..e87158ab1d 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -841,7 +841,11 @@ bool SCH_PAINTER::setDeviceColors( const LIB_ITEM* aItem, int aLayer, bool aDimm
         {
             COLOR4D fillColour = shape->GetFillColor();
 
-            if( aDimmed )
+            if( m_schSettings.m_OverrideItemColors )
+            {
+                fillColour = getRenderColor( aItem, LAYER_DEVICE_BACKGROUND, false, aDimmed );
+            }
+            else if( aDimmed )
             {
                 fillColour = fillColour.Mix(
                         m_schSettings.GetLayerColor( LAYER_SCHEMATIC_BACKGROUND ), 0.5f );