From d9846a006a4ab85cb966ed614eaf7041335792e4 Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Sat, 24 Sep 2022 03:31:02 +0100 Subject: [PATCH] Get lib shape fill color from settings if not specified by shape --- eeschema/dialogs/dialog_lib_shape_properties.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eeschema/dialogs/dialog_lib_shape_properties.cpp b/eeschema/dialogs/dialog_lib_shape_properties.cpp index 87c0f2855d..fbc9317a4c 100644 --- a/eeschema/dialogs/dialog_lib_shape_properties.cpp +++ b/eeschema/dialogs/dialog_lib_shape_properties.cpp @@ -145,7 +145,7 @@ bool DIALOG_LIB_SHAPE_PROPERTIES::TransferDataToWindow() COLOR4D color = m_shape->GetStroke().GetColor(); if( color == COLOR4D::UNSPECIFIED ) - m_frame->GetRenderSettings()->GetLayerColor( LAYER_DEVICE ); + color = m_frame->GetRenderSettings()->GetLayerColor( LAYER_DEVICE ); m_fillColorSwatch->SetSwatchColor( color, false ); } @@ -185,7 +185,7 @@ void DIALOG_LIB_SHAPE_PROPERTIES::onFill( wxCommandEvent& event ) COLOR4D color = m_shape->GetStroke().GetColor(); if( color == COLOR4D::UNSPECIFIED ) - m_frame->GetRenderSettings()->GetLayerColor( LAYER_DEVICE ); + color = m_frame->GetRenderSettings()->GetLayerColor( LAYER_DEVICE ); m_fillColorSwatch->SetSwatchColor( color, false ); }