From 74a5db64c237cb7592187e3215ecdfc8de2a6509 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 28 Jan 2021 23:30:59 +0000
Subject: [PATCH] Update pad netnames (and numbers) to the new visibility
 architecture.

---
 pcbnew/pcb_draw_panel_gal.cpp | 3 ++-
 pcbnew/pcb_painter.cpp        | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index ecdee87b51..544813eb32 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -277,7 +277,8 @@ void PCB_DRAW_PANEL_GAL::SetHighContrastLayer( PCB_LAYER_ID aLayer )
         // fixme do not like the idea of storing the list of layers here,
         // should be done in some other way I guess..
         LAYER_NUM layers[] = {
-                GetNetnameLayer( aLayer ),
+                GetNetnameLayer( aLayer ), LAYER_VIAS_NETNAMES,
+                LAYER_PAD_FR_NETNAMES, LAYER_PAD_BK_NETNAMES, LAYER_PADS_NETNAMES,
                 ZONE_LAYER_FOR( aLayer ),
                 LAYER_PADS_TH, LAYER_PADS_PLATEDHOLES, LAYER_NON_PLATEDHOLES,
                 LAYER_VIA_THROUGH, LAYER_VIA_BBLIND, LAYER_VIA_MICROVIA,
diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index 182d26de8a..4972254dec 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -338,6 +338,11 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
             if( !static_cast<const TRACK*>( item )->IsOnLayer( primary ) )
                 isActive = false;
         }
+        else if( item->Type() == PCB_PAD_T )
+        {
+            if( !static_cast<const PAD*>( item )->FlashLayer( primary ) )
+                isActive = false;
+        }
 
         if( !isActive )
         {