Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 12032)
+++ trunk/src/draw.c	(revision 12033)
@@ -251,7 +251,7 @@
 	for (i = ngroups - 1; i >= 0; i--) {
 		pcb_layergrp_id_t group = drawn_groups[i];
 
-		if (pcb_layer_gui_set_glayer(group, 0)) {
+		if (pcb_layer_gui_set_glayer(PCB, group, 0)) {
 			DrawLayerGroup(group, drawn_area);
 			pcb_gui->end_layer();
 		}
@@ -271,13 +271,13 @@
 
 	/* Draw the solder mask if turned on */
 	gid = pcb_layergrp_get_top_mask();
-	if ((gid >= 0) && (pcb_layer_gui_set_glayer(gid, 0))) {
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, 0))) {
 		pcb_draw_mask(PCB_COMPONENT_SIDE, drawn_area);
 		pcb_gui->end_layer();
 	}
 
 	gid = pcb_layergrp_get_bottom_mask();
-	if ((gid >= 0) && (pcb_layer_gui_set_glayer(gid, 0))) {
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, 0))) {
 		pcb_draw_mask(PCB_SOLDER_SIDE, drawn_area);
 		pcb_gui->end_layer();
 	}
@@ -285,7 +285,7 @@
 	/* Draw silks */
 	slk_len = pcb_layergrp_list(PCB, PCB_LYT_SILK, slk, sizeof(slk) / sizeof(slk[0]));
 	for(i = 0; i < slk_len; i++) {
-		if (pcb_layer_gui_set_glayer(slk[i], 0)) {
+		if (pcb_layer_gui_set_glayer(PCB, slk[i], 0)) {
 			unsigned int loc = pcb_layergrp_flags(PCB, slk[i]);
 			pcb_draw_silk(loc & PCB_LYT_ANYWHERE, drawn_area);
 			pcb_gui->end_layer();
@@ -331,7 +331,7 @@
 
 	paste_empty = pcb_layer_is_paste_empty(PCB, PCB_COMPONENT_SIDE);
 	gid = pcb_layergrp_get_top_paste();
-	if ((gid >= 0) && (pcb_layer_gui_set_glayer(gid, paste_empty))) {
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, paste_empty))) {
 		pcb_draw_paste(PCB_COMPONENT_SIDE, drawn_area);
 		pcb_gui->end_layer();
 	}
@@ -338,7 +338,7 @@
 
 	paste_empty = pcb_layer_is_paste_empty(PCB, PCB_SOLDER_SIDE);
 	gid = pcb_layergrp_get_bottom_paste();
-	if ((gid >= 0) && (pcb_layer_gui_set_glayer(gid, paste_empty))) {
+	if ((gid >= 0) && (pcb_layer_gui_set_glayer(PCB, gid, paste_empty))) {
 		pcb_draw_paste(PCB_SOLDER_SIDE, drawn_area);
 		pcb_gui->end_layer();
 	}
Index: trunk/src/layer_grp.c
===================================================================
--- trunk/src/layer_grp.c	(revision 12032)
+++ trunk/src/layer_grp.c	(revision 12033)
@@ -562,7 +562,7 @@
 	return 1;
 }
 
-int pcb_layer_gui_set_glayer(pcb_layergrp_id_t grp, int is_empty)
+int pcb_layer_gui_set_glayer(pcb_board_t *pcb, pcb_layergrp_id_t grp, int is_empty)
 {
 	/* if there's no GUI, that means no draw should be done */
 	if (pcb_gui == NULL)
@@ -569,7 +569,7 @@
 		return 0;
 
 	if (pcb_gui->set_layer_group != NULL)
-		return pcb_gui->set_layer_group(grp, PCB->LayerGroups.grp[grp].lid[0], pcb_layergrp_flags(PCB, grp), is_empty);
+		return pcb_gui->set_layer_group(grp, pcb->LayerGroups.grp[grp].lid[0], pcb_layergrp_flags(PCB, grp), is_empty);
 
 	/* if the GUI doesn't have a set_layer, assume it wants to draw all layers */
 	return 1;
@@ -686,7 +686,7 @@
 {
 	pcb_layergrp_id_t n;
 	for (n = 0; n < pcb->LayerGroups.len; n++)
-		if ((PCB->LayerGroups.grp[n].name != NULL) && (strcmp(PCB->LayerGroups.grp[n].name, name) == 0))
+		if ((pcb->LayerGroups.grp[n].name != NULL) && (strcmp(pcb->LayerGroups.grp[n].name, name) == 0))
 			return n;
 	return -1;
 }
Index: trunk/src/layer_grp.h
===================================================================
--- trunk/src/layer_grp.h	(revision 12032)
+++ trunk/src/layer_grp.h	(revision 12033)
@@ -78,7 +78,7 @@
 pcb_bool pcb_layergrp_is_empty(pcb_board_t *pcb, pcb_layergrp_id_t lgrp);
 
 /* call the gui to set a layer group */
-int pcb_layer_gui_set_glayer(pcb_layergrp_id_t grp, int is_empty);
+int pcb_layer_gui_set_glayer(pcb_board_t *pcb, pcb_layergrp_id_t grp, int is_empty);
 
 /* returns a bitfield of pcb_layer_type_t; returns 0 if layer_idx is invalid. */
 unsigned int pcb_layergrp_flags(pcb_board_t *pcb, pcb_layergrp_id_t group_idx);