Fix bug introduced when edge-thickness adjustments were moved.

Fixes: lp:1835132
* https://bugs.launchpad.net/kicad/+bug/1835132
This commit is contained in:
Jeff Young 2019-07-03 12:07:11 +01:00
parent 0eed5175cc
commit a2fe319b92
1 changed files with 6 additions and 5 deletions

View File

@ -631,11 +631,9 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE_CONTAINER* aZone, SHAPE_
if( !item_boundingbox.Intersects( zone_boundingbox ) )
continue;
// Add the zone outline area.
// However if the zone has the same net as the current zone,
// do not add any clearance.
// the zone will be connected to the current zone, but filled areas
// will use different parameters (clearance, thermal shapes )
// Add the zone outline area. Don't use any clearance for keepouts, or for zones with
// the same net (they will be connected but will honor their own clearance, thermal
// connections, etc.).
bool sameNet = aZone->GetNetCode() == zone->GetNetCode();
bool useNetClearance = true;
int minClearance = zone_clearance;
@ -644,7 +642,10 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE_CONTAINER* aZone, SHAPE_
minClearance = std::max( minClearance, zone->GetClearance() );
if( zone->GetIsKeepout() || sameNet )
{
minClearance = 0;
useNetClearance = false;
}
zone->TransformOutlinesShapeWithClearanceToPolygon( aHoles, minClearance, useNetClearance );
}