Index: draw_ly_spec.c
===================================================================
--- draw_ly_spec.c	(revision 30978)
+++ draw_ly_spec.c	(revision 30979)
@@ -63,9 +63,9 @@
 	cctx.invert = 0;
 
 	if ((cctx.grp == NULL) || (cctx.grp->len == 0)) { /* fallback: no layers -> original code: draw a single auto-add */
-		pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
-		pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
-		pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
+		pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
+		pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
+		pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
 	}
 	else {
 		comp_draw_layer(&cctx, pcb_draw_paste_auto_, &side);
@@ -186,11 +186,11 @@
 
 		if ((lyt_type & PCB_LYT_SILK) && (pcb_is_silk_old_style(&cctx, lid))) {
 			/* fallback: implicit layer -> original code: draw auto+manual */
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
 			pcb_draw_layer(info, pcb_get_layer(info->pcb->Data, lid));
 			pcb_draw_silk_auto(&cctx, &lyt_side);
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
 		}
 		else {
 			comp_draw_layer(&cctx, pcb_draw_silk_auto, &lyt_side);
@@ -271,13 +271,13 @@
 
 		if (pcb_layer_gui_set_layer(gid, g, (numobj == 0), &info->xform_exporter)) {
 			/* boundary does NOT support compisiting, everything is drawn in positive */
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
 			for(n = 0; n < g->len; n++) {
 				pcb_layer_t *ly = pcb_get_layer(info->pcb->Data, g->lid[n]);
 				pcb_draw_layer(info, ly);
 			}
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
 			pcb_render->end_layer(pcb_render);
 		}
 	}
@@ -287,8 +287,8 @@
 		   We should check for pcb_render->gui here, but it's kinda cool seeing the
 		   auto-outline magically disappear when you first add something to
 		   the outline layer.  */
-		pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
-		pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
+		pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
+		pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
 
 		pcb_render->set_color(pcb_draw_out.fgGC, &PCB->Data->Layer[goutl->lid[0]].meta.real.color);
 		pcb_hid_set_line_cap(pcb_draw_out.fgGC, rnd_cap_round);
@@ -295,7 +295,7 @@
 		pcb_hid_set_line_width(pcb_draw_out.fgGC, conf_core.design.min_wid);
 		pcb_render->draw_rect(pcb_draw_out.fgGC, 0, 0, PCB->hidlib.size_x, PCB->hidlib.size_y);
 
-		pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
+		pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
 		pcb_render->end_layer(pcb_render);
 	}
 
@@ -307,19 +307,19 @@
 
 	if ((uslot != NULL) && (uslot->meta.real.vis)) {
 		if (pcb_layer_gui_set_glayer(PCB, uslot->meta.real.grp, unplated <= 0, &info->xform)) {
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
 			pcb_draw_pstk_slots(info, uslot->meta.real.grp, PCB_PHOLE_UNPLATED | PCB_PHOLE_BB);
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
 			pcb_render->end_layer(pcb_render);
 		}
 	}
 	if ((pslot != NULL) && (pslot->meta.real.vis)) {
 		if (pcb_layer_gui_set_glayer(PCB, pslot->meta.real.grp, plated <= 0, &info->xform)) {
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, info->drawn_area);
 			pcb_draw_pstk_slots(info, pslot->meta.real.grp, PCB_PHOLE_PLATED | PCB_PHOLE_BB);
-			pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
+			pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, info->drawn_area);
 			pcb_render->end_layer(pcb_render);
 		}
 	}
@@ -330,10 +330,10 @@
 
 static void pcb_draw_rats(pcb_draw_info_t *info, const rnd_rnd_box_t *drawn_area)
 {
-	pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
-	pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
+	pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_RESET, pcb_draw_out.direct, drawn_area);
+	pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_POSITIVE, pcb_draw_out.direct, drawn_area);
 	pcb_r_search(PCB->Data->rat_tree, drawn_area, NULL, pcb_rat_draw_callback, info, NULL);
-	pcb_render->set_drawing_mode(pcb_render, PCB_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
+	pcb_render->set_drawing_mode(pcb_render, RND_HID_COMP_FLUSH, pcb_draw_out.direct, drawn_area);
 }
 
 static void pcb_draw_assembly(pcb_draw_info_t *info, pcb_layer_type_t lyt_side)