From 81bed9ab968c1bd75d9d73eb017f03dcfc826d41 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Fri, 18 Feb 2022 12:49:13 +0000
Subject: [PATCH] Add zone margin when subtracting other graphics and zones.

It was already added for pads and tracks, but not the other objects.

Fixes https://gitlab.com/kicad/code/kicad/issues/10896
---
 pcbnew/zone_filler.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp
index 112f99efe7..1a8a40f96e 100644
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@@ -791,7 +791,7 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE* aZone, PCB_LAYER_ID aLa
                                                                     aZone, aItem, Margin ) );
                         }
 
-                        addKnockout( aItem, aLayer, gap, ignoreLineWidths, aHoles );
+                        addKnockout( aItem, aLayer, gap + extra_margin, ignoreLineWidths, aHoles );
                     }
                 }
             };
@@ -859,7 +859,8 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE* aZone, PCB_LAYER_ID aLa
                                                      aLayer );
 
                         SHAPE_POLY_SET poly;
-                        aKnockout->TransformShapeWithClearanceToPolygon( poly, aLayer, gap,
+                        aKnockout->TransformShapeWithClearanceToPolygon( poly, aLayer,
+                                                                         gap + extra_margin,
                                                                          m_maxError,
                                                                          ERROR_OUTSIDE );
                         aHoles.Append( poly );