Index: trunk/src/draw_composite.c
===================================================================
--- trunk/src/draw_composite.c	(revision 11283)
+++ trunk/src/draw_composite.c	(revision 11284)
@@ -35,16 +35,10 @@
 
 	unsigned thin:1;
 	unsigned invert:1;
-	unsigned poly_before:1;
-	unsigned poly_after:1;
 } comp_ctx_t;
 
-static void comp_fill_board(comp_ctx_t *ctx, int is_before)
+static void comp_fill_board(comp_ctx_t *ctx)
 {
-	/* Skip the mask drawing if the GUI doesn't want this type */
-	if (((is_before==1) && !ctx->poly_before) || ((is_before == 0) && !ctx->poly_after))
-		return;
-
 	pcb_gui->set_color(Output.fgGC, ctx->color);
 	if (ctx->screen == NULL)
 		pcb_gui->fill_rect(Output.fgGC, 0, 0, ctx->pcb->MaxWidth, ctx->pcb->MaxHeight);
@@ -96,7 +90,6 @@
 		return;
 	}
 
-	comp_fill_board(ctx, 0);
 	pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, Output.direct, ctx->screen);
 }
 
@@ -111,14 +104,9 @@
 		negative = !negative;
 
 	if ((!ctx->thin) && (negative)) {
-		/* old way of drawing the big poly for the negative */
-		comp_fill_board(ctx, 1);
-
-		if (!pcb_gui->poly_before) {
-			/* new way */
-			pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, Output.direct, ctx->screen);
-			comp_fill_board(ctx, 2);
-		}
+		/* drawing the big poly for the negative */
+		pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, Output.direct, ctx->screen);
+		comp_fill_board(ctx);
 	}
 }
 
Index: trunk/src/draw_ly_spec.c
===================================================================
--- trunk/src/draw_ly_spec.c	(revision 11283)
+++ trunk/src/draw_ly_spec.c	(revision 11284)
@@ -49,10 +49,7 @@
 	cctx.color = conf_core.appearance.color.paste;
 	cctx.thin = conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly || conf_core.editor.wireframe_draw;
 	cctx.invert = 0;
-	cctx.poly_before = pcb_gui->poly_before;
-	cctx.poly_after = pcb_gui->poly_after;
 
-
 	if ((cctx.grp == NULL) || (cctx.grp->len == 0)) /* fallback: no layers -> original code: draw a single auto-add */
 		pcb_pad_paste_draw(side, drawn_area);
 	else {
@@ -83,10 +80,7 @@
 	cctx.color = conf_core.appearance.color.mask;
 	cctx.thin = conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly || conf_core.editor.wireframe_draw;
 	cctx.invert = pcb_gui->mask_invert;
-	cctx.poly_before = pcb_gui->poly_before;
-	cctx.poly_after = pcb_gui->poly_after;
 
-
 	if (!cctx.invert)
 		Output.direct = 0;
 
@@ -131,8 +125,6 @@
 	cctx.color = /*PCB->Data->Layer[lid].Color*/ conf_core.appearance.color.element;
 	cctx.thin = conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly || conf_core.editor.wireframe_draw;
 	cctx.invert = 0;
-	cctx.poly_before = pcb_gui->poly_before;
-	cctx.poly_after = pcb_gui->poly_after;
 
 	if ((cctx.grp == NULL) || (cctx.grp->len < 2) ||   /* fallback: no layers -> original code: draw auto+manual */
 			(((cctx.grp->len == 1)) && ((PCB->Data->Layer[lid].comb & (PCB_LYC_AUTO | PCB_LYC_SUB)) == PCB_LYC_AUTO))) {    /* fallback: one positive auto layer -> original code: draw auto+manual */
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 11283)
+++ trunk/src/hid.h	(revision 11284)
@@ -176,15 +176,6 @@
 	   and EPS exporters.  */
 	unsigned exporter:1;
 
-	/* If set, the redraw code will draw polygons before erasing the
-	   clearances.  */
-	unsigned poly_before:1;
-
-	/* If set, the redraw code will draw polygons after erasing the
-	   clearances.  Note that HIDs may set both of these, in which case
-	   polygons will be drawn twice.  */
-	unsigned poly_after:1;
-
 	/* If set, draw the mask layer inverted. Normally the mask is a filled
 	   rectangle over the board with cutouts at pins/pads. The HIDs
 	   use render in normal mode, gerber renders in inverse mode. */
Index: trunk/src/hid_extents.c
===================================================================
--- trunk/src/hid_extents.c	(revision 11283)
+++ trunk/src/hid_extents.c	(revision 11284)
@@ -129,7 +129,6 @@
 	extents_hid.struct_size = sizeof(pcb_hid_t);
 	extents_hid.name = "extents-extents";
 	extents_hid.description = "used to calculate extents";
-	extents_hid.poly_before = 1;
 
 	extents_hid.set_layer_group = extents_set_layer_group;
 	extents_hid.make_gc = extents_make_gc;
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 11283)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 11284)
@@ -891,7 +891,6 @@
 	gcode_hid.name = "gcode";
 	gcode_hid.description = "G-CODE export";
 	gcode_hid.exporter = 1;
-	gcode_hid.poly_before = 1;
 
 	gcode_hid.get_export_options = gcode_get_export_options;
 	gcode_hid.do_export = gcode_do_export;
Index: trunk/src_plugins/export_lpr/lpr.c
===================================================================
--- trunk/src_plugins/export_lpr/lpr.c	(revision 11283)
+++ trunk/src_plugins/export_lpr/lpr.c	(revision 11284)
@@ -140,7 +140,6 @@
 	lpr_hid.name = "lpr";
 	lpr_hid.description = "Postscript print";
 	lpr_hid.printer = 1;
-	lpr_hid.poly_before = 1;
 
 	lpr_hid.get_export_options = lpr_get_export_options;
 	lpr_hid.do_export = lpr_do_export;
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 11283)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 11284)
@@ -976,7 +976,6 @@
 	nelma_hid.name = "nelma";
 	nelma_hid.description = "Numerical analysis package export";
 	nelma_hid.exporter = 1;
-	nelma_hid.poly_before = 1;
 
 	nelma_hid.get_export_options = nelma_get_export_options;
 	nelma_hid.do_export = nelma_do_export;
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 11283)
+++ trunk/src_plugins/export_png/png.c	(revision 11284)
@@ -1687,7 +1687,6 @@
 	png_hid.name = "png";
 	png_hid.description = "GIF/JPEG/PNG export";
 	png_hid.exporter = 1;
-	png_hid.poly_before = 1;
 
 	png_hid.get_export_options = png_get_export_options;
 	png_hid.do_export = png_do_export;
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 11283)
+++ trunk/src_plugins/export_ps/eps.c	(revision 11284)
@@ -628,8 +628,6 @@
 	eps_hid.name = "eps";
 	eps_hid.description = "Encapsulated Postscript";
 	eps_hid.exporter = 1;
-	eps_hid.poly_before = 0;
-	eps_hid.poly_after = 0;
 
 	eps_hid.get_export_options = eps_get_export_options;
 	eps_hid.do_export = eps_do_export;
Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 11283)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 11284)
@@ -1423,8 +1423,5 @@
 		hid->request_debug_draw = ghid_gdk_request_debug_draw;
 		hid->flush_debug_draw = ghid_gdk_flush_debug_draw;
 		hid->finish_debug_draw = ghid_gdk_finish_debug_draw;
-
-		hid->poly_after = 0;
-		hid->poly_before = 0;
 	}
 }
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 11283)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 11284)
@@ -1179,8 +1179,6 @@
 	hid->flush_debug_draw = ghid_gl_flush_debug_draw;
 	hid->finish_debug_draw = ghid_gl_finish_debug_draw;
 
-	hid->poly_before = 0;
-	hid->poly_after = 0;
 	hid->holes_after = 1;
 	}
 }
Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c
===================================================================
--- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 11283)
+++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 11284)
@@ -1634,7 +1634,5 @@
 		hid->flush_debug_draw = ghid_cairo_flush_debug_draw;
 		hid->finish_debug_draw = ghid_cairo_finish_debug_draw;
 
-		hid->poly_before = 0;     /* no need for redraw, neither before nor after   */
-		hid->poly_after = 0;
 	}
 }
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 11283)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 11284)
@@ -3730,8 +3730,6 @@
 	lesstif_hid.name = "lesstif";
 	lesstif_hid.description = "LessTif - a Motif clone for X/Unix";
 	lesstif_hid.gui = 1;
-	lesstif_hid.poly_before = 0;
-	lesstif_hid.poly_after = 0;
 	lesstif_hid.can_mask_clear_rats = 1;
 
 	lesstif_hid.get_export_options = lesstif_get_export_options;
Index: trunk/src_plugins/lib_gtk_hid/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 11283)
+++ trunk/src_plugins/lib_gtk_hid/glue_hid.c	(revision 11284)
@@ -489,7 +489,6 @@
 
 	dst->struct_size = sizeof(pcb_hid_t);
 	dst->gui = 1;
-	dst->poly_after = 0;
 
 	dst->do_export = gtkhid_do_export;
 	dst->do_exit = ghid_do_exit;