Index: draw_ly_spec.c
===================================================================
--- draw_ly_spec.c	(revision 28078)
+++ draw_ly_spec.c	(revision 28079)
@@ -180,7 +180,7 @@
 			/* 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_draw_layer(info, LAYER_PTR(lid));
+			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);
 		}
@@ -248,7 +248,7 @@
 		   outline */
 		numobj = 0;
 		for(n = 0; n < g->len; n++) {
-			pcb_layer_t *ly = LAYER_PTR(g->lid[n]);
+			pcb_layer_t *ly = pcb_get_layer(info->pcb->Data, g->lid[n]);
 			if (ly->line_tree != NULL)
 				numobj += ly->line_tree->size;
 			if (ly->arc_tree != NULL)
@@ -266,7 +266,7 @@
 			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);
 			for(n = 0; n < g->len; n++) {
-				pcb_layer_t *ly = LAYER_PTR(g->lid[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);