From 4505896634521022473e48084fa02c96dbe43ffd Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 5 Oct 2016 15:12:10 +0200 Subject: [PATCH] A few zone outline context menu commands missing after creating a keepout area ( partial fix of lp:1630368 ) --- pcbnew/class_zone.cpp | 3 +-- pcbnew/zones_by_polygon.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp index a03d431932..912f47ace1 100644 --- a/pcbnew/class_zone.cpp +++ b/pcbnew/class_zone.cpp @@ -320,8 +320,7 @@ void ZONE_CONTAINER::DrawFilledArea( EDA_DRAW_PANEL* panel, m_ZoneMinThickness, color ); else GRFillCSegm( panel->GetClipBox(), DC, - x0, y0, x1, y1, - m_ZoneMinThickness, color ); + x0, y0, x1, y1, m_ZoneMinThickness, color ); } } diff --git a/pcbnew/zones_by_polygon.cpp b/pcbnew/zones_by_polygon.cpp index f6c45d0f06..a29fd80986 100644 --- a/pcbnew/zones_by_polygon.cpp +++ b/pcbnew/zones_by_polygon.cpp @@ -768,7 +768,6 @@ bool PCB_EDIT_FRAME::End_Zone( wxDC* DC ) { zone->Outline()->CloseLastContour(); // Close the current corner list GetBoard()->Add( zone ); - GetBoard()->m_CurrentZoneContour = NULL; // Add this zone in picked list, as new item ITEM_PICKER picker( zone, UR_NEW ); @@ -788,6 +787,7 @@ bool PCB_EDIT_FRAME::End_Zone( wxDC* DC ) s_AddCutoutToCurrentZone = false; s_CurrentZone = NULL; + GetBoard()->m_CurrentZoneContour = NULL; GetScreen()->SetCurItem( NULL ); // This outline can be deleted when merging outlines