haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix breakage from layer change. 

We have to be careful about processing edges on the Edge_Cuts even
when we're talking about a zone on some other layer.
This commit is contained in:
Jeff Young 2020-08-13 00:17:44 +01:00
parent 0c9d08249f
commit a407befa4c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/zone_filler.cpp
View File

@ -569,6 +569,7 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE_CONTAINER* aZone, PCB_LA
SHAPE_POLY_SET& aHoles ) SHAPE_POLY_SET& aHoles )
{ {
static DRAWSEGMENT dummyEdge; static DRAWSEGMENT dummyEdge;
dummyEdge.SetParent( m_board );
dummyEdge.SetLayer( Edge_Cuts ); dummyEdge.SetLayer( Edge_Cuts );
// a small extra clearance to be sure actual track clearance is not smaller // a small extra clearance to be sure actual track clearance is not smaller
@ -675,10 +676,18 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE_CONTAINER* aZone, PCB_LA
if( aItem->GetBoundingBox().Intersects( zone_boundingbox ) ) if( aItem->GetBoundingBox().Intersects( zone_boundingbox ) )
{ {
bool ignoreLineWidth = aItem->IsOnLayer( Edge_Cuts ); PCB_LAYER_ID layer = aLayer;
bool ignoreLineWidth = false;
if( aItem->IsOnLayer( Edge_Cuts ) )
{
layer = Edge_Cuts;
ignoreLineWidth = true;
}
int gap = aZone->GetClearance( aLayer, aItem ); int gap = aZone->GetClearance( aLayer, aItem );
addKnockout( aItem, aLayer, gap, ignoreLineWidth, aHoles ); addKnockout( aItem, layer, gap, ignoreLineWidth, aHoles );
} }
}; };