From 31a778f600df77b753657dd2f9474fb97c6c7d95 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Tue, 30 Sep 2025 11:32:46 +0100
Subject: [PATCH] Only plot white drill marks if we find something to knock
 them out of.

In particular, a NTPH pad with a hole larger than
the pad should have drill marks drawn in black.
---
 pcbnew/plot_brditems_plotter.cpp | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pcbnew/plot_brditems_plotter.cpp b/pcbnew/plot_brditems_plotter.cpp
index 6607492e5e..dea7f64a3a 100644
--- a/pcbnew/plot_brditems_plotter.cpp
+++ b/pcbnew/plot_brditems_plotter.cpp
@@ -297,7 +297,7 @@ void BRDITEMS_PLOTTER::PlotPad( const PAD* aPad, PCB_LAYER_ID aLayer, const COLO
 
         case PAD_SHAPE::RECTANGLE:
         {
-            VECTOR2I size = aPad->GetSize( aLayer );
+            const VECTOR2I& size = aPad->GetSize( aLayer );
 
             m_plotter->ThickRect( VECTOR2I( shape_pos.x - ( size.x / 2 ), shape_pos.y - (size.y / 2 ) ),
                                   VECTOR2I( shape_pos.x + ( size.x / 2 ), shape_pos.y + (size.y / 2 ) ),
@@ -764,7 +764,7 @@ void BRDITEMS_PLOTTER::PlotText( const EDA_TEXT* aText, PCB_LAYER_ID aLayer, boo
     COLOR4D color = getColor( aLayer );
     m_plotter->SetColor( color );
 
-    VECTOR2I pos = aText->GetTextPos();
+    const VECTOR2I& pos = aText->GetTextPos();
 
     TEXT_ATTRIBUTES attrs = aText->GetAttributes();
     attrs.m_StrokeWidth = aText->GetEffectiveTextPenWidth();
@@ -1307,7 +1307,24 @@ void BRDITEMS_PLOTTER::PlotDrillMarks()
                 continue;
 
             if( m_plotter->GetPlotterType() != PLOT_FORMAT::DXF || GetDXFPlotMode() == FILLED )
-                m_plotter->SetColor( ( pad->GetLayerSet() & m_layerMask ).any() ? WHITE : BLACK );
+            {
+                // Drill mark is in black unless we can find something to knock it out of
+                m_plotter->SetColor( BLACK );
+
+                for( PCB_LAYER_ID layer : m_layerMask )
+                {
+                    if( !pad->IsOnLayer( layer ) )
+                        continue;
+
+                    VECTOR2I padSize = pad->GetSize( layer );
+
+                    if( padSize.x > pad->GetDrillSizeX() || padSize.y > pad->GetDrillSizeY() )
+                    {
+                        m_plotter->SetColor( WHITE );
+                        break;
+                    }
+                }
+            }
 
             plotOneDrillMark( pad->GetDrillShape(), pad->GetPosition(), pad->GetDrillSize(),
                               pad->GetSize( PADSTACK::ALL_LAYERS ), pad->GetOrientation(), smallDrill );