From cfeb55a28812668e5646b3c1a7e3e93653ef6bc9 Mon Sep 17 00:00:00 2001
From: Marco Mattila <marcom99@gmail.com>
Date: Sun, 9 Jan 2011 23:12:22 +0200
Subject: [PATCH] Fix clearance problem between zones and edge segments in
 pcbnew.

---
 pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp | 6 +++---
 pcbnew/zones_convert_brd_items_to_polygons_with_Kbool.cpp | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp b/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
index 071e32139a..0c46914474 100644
--- a/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
+++ b/pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
@@ -280,7 +280,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
             if( item_boundingbox.Intersects( zone_boundingbox ) )
             {
                 ( (EDGE_MODULE*) item )->TransformShapeWithClearanceToPolygon(
-                    cornerBufferPolysToSubstract, m_ZoneClearance,
+                    cornerBufferPolysToSubstract, zone_clearance,
                     s_CircleToSegmentsCount, s_Correction );
             }
         }
@@ -297,7 +297,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
         case TYPE_DRAWSEGMENT:
             ( (DRAWSEGMENT*) item )->TransformShapeWithClearanceToPolygon(
                 cornerBufferPolysToSubstract,
-                m_ZoneClearance,
+                zone_clearance,
                 s_CircleToSegmentsCount,
                 s_Correction );
             break;
@@ -306,7 +306,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
         case TYPE_TEXTE:
             ( (TEXTE_PCB*) item )->TransformShapeWithClearanceToPolygon(
                 cornerBufferPolysToSubstract,
-                m_ZoneClearance,
+                zone_clearance,
                 s_CircleToSegmentsCount,
                 s_Correction );
             break;
diff --git a/pcbnew/zones_convert_brd_items_to_polygons_with_Kbool.cpp b/pcbnew/zones_convert_brd_items_to_polygons_with_Kbool.cpp
index 635eef26ce..a423872567 100644
--- a/pcbnew/zones_convert_brd_items_to_polygons_with_Kbool.cpp
+++ b/pcbnew/zones_convert_brd_items_to_polygons_with_Kbool.cpp
@@ -318,7 +318,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
             if( item_boundingbox.Intersects( zone_boundingbox ) )
             {
                 ( (EDGE_MODULE*) item )->TransformShapeWithClearanceToPolygon(
-                    cornerBufferPolysToSubstract, m_ZoneClearance,
+                    cornerBufferPolysToSubstract, zone_clearance,
                     s_CircleToSegmentsCount, s_Correction );
             }
         }
@@ -335,7 +335,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
         case TYPE_DRAWSEGMENT:
             ( (DRAWSEGMENT*) item )->TransformShapeWithClearanceToPolygon(
                 cornerBufferPolysToSubstract,
-                m_ZoneClearance,
+                zone_clearance,
                 s_CircleToSegmentsCount,
                 s_Correction );
             break;
@@ -344,7 +344,7 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
         case TYPE_TEXTE:
             ( (TEXTE_PCB*) item )->TransformShapeWithClearanceToPolygon(
                 cornerBufferPolysToSubstract,
-                m_ZoneClearance,
+                zone_clearance,
                 s_CircleToSegmentsCount,
                 s_Correction );
             break;