Index: trunk/src/layer_ui.c
===================================================================
--- trunk/src/layer_ui.c	(revision 34515)
+++ trunk/src/layer_ui.c	(revision 34516)
@@ -41,10 +41,9 @@
 
 vtp0_t pcb_uilayers;
 
-pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const rnd_color_t *color)
+pcb_layer_t *pcb_uilayer_alloc(pcb_board_t *pcb, const char *cookie, const char *name, const rnd_color_t *color)
 {
 	int n;
-	pcb_board_t *pcb = PCB;
 	pcb_layer_t *l;
 	void **p;
 
Index: trunk/src/layer_ui.h
===================================================================
--- trunk/src/layer_ui.h	(revision 34515)
+++ trunk/src/layer_ui.h	(revision 34516)
@@ -43,7 +43,7 @@
 extern vtp0_t pcb_uilayers;
 
 
-pcb_layer_t *pcb_uilayer_alloc(const char *cookie, const char *name, const rnd_color_t *color);
+pcb_layer_t *pcb_uilayer_alloc(pcb_board_t *pcb, const char *cookie, const char *name, const rnd_color_t *color);
 void pcb_uilayer_free(pcb_layer_t *l);
 void pcb_uilayer_free_all_cookie(const char *cookie);
 void pcb_uilayer_init(void);
Index: trunk/src_plugins/acompnet/acompnet.c
===================================================================
--- trunk/src_plugins/acompnet/acompnet.c	(revision 34515)
+++ trunk/src_plugins/acompnet/acompnet.c	(revision 34516)
@@ -181,7 +181,7 @@
 	long int is, ie;
 
 	if (ly == NULL)
-		ly = pcb_uilayer_alloc(acompnet_cookie, "autocomp-net", &ly_clr);
+		ly = pcb_uilayer_alloc(PCB_ACT_BOARD, acompnet_cookie, "autocomp-net", &ly_clr);
 
 	pcb_msgr_init(&gr);
 	acompnet_mesh(&gr, PCB_CURRLAYER(PCB));
Index: trunk/src_plugins/act_draw/act_draw.c
===================================================================
--- trunk/src_plugins/act_draw/act_draw.c	(revision 34515)
+++ trunk/src_plugins/act_draw/act_draw.c	(revision 34516)
@@ -291,7 +291,7 @@
 			if (rnd_color_load_str(&clr, color) != 0)
 				return FGW_ERR_ARG_CONV;
 
-			layer = pcb_uilayer_alloc(uilayer_cookie, name, &clr);
+			layer = pcb_uilayer_alloc(PCB_ACT_BOARD, uilayer_cookie, name, &clr);
 			if (layer == NULL)
 				return FGW_ERR_ARG_CONV;
 
Index: trunk/src_plugins/export_openems/mesh.c
===================================================================
--- trunk/src_plugins/export_openems/mesh.c	(revision 34515)
+++ trunk/src_plugins/export_openems/mesh.c	(revision 34516)
@@ -961,7 +961,7 @@
 	return 0;
 }
 
-static void mesh_layer_reset()
+static void mesh_layer_reset(pcb_board_t *pcb)
 {
 	static rnd_color_t clr;
 
@@ -972,8 +972,8 @@
 		pcb_uilayer_free(mesh.ui_layer_xy);
 	if (mesh.ui_layer_z != NULL)
 		pcb_uilayer_free(mesh.ui_layer_z);
-	mesh.ui_layer_xy = pcb_uilayer_alloc(mesh_ui_cookie, "mesh xy", &clr);
-	mesh.ui_layer_z = pcb_uilayer_alloc(mesh_ui_cookie, "mesh z", &clr);
+	mesh.ui_layer_xy = pcb_uilayer_alloc(pcb, mesh_ui_cookie, "mesh xy", &clr);
+	mesh.ui_layer_z = pcb_uilayer_alloc(pcb, mesh_ui_cookie, "mesh z", &clr);
 }
 
 static void ia_close_cb(void *caller_data, rnd_hid_attr_ev_t ev)
@@ -1063,7 +1063,7 @@
 
 static void ia_gen(void)
 {
-	mesh_layer_reset();
+	mesh_layer_reset(PCB);
 	mesh.layer = PCB_CURRLAYER(PCB);
 
 	if (ia.dlg[ia.hor].val.lng)
Index: trunk/src_plugins/millpath/toolpath.c
===================================================================
--- trunk/src_plugins/millpath/toolpath.c	(revision 34515)
+++ trunk/src_plugins/millpath/toolpath.c	(revision 34516)
@@ -192,13 +192,13 @@
 		rnd_color_load_str(&clr3, "#FFCC55");
 
 	if (result->res_ply == NULL)
-		result->res_ply = pcb_uilayer_alloc(pcb_millpath_cookie, "mill remove", &clr1);
+		result->res_ply = pcb_uilayer_alloc(pcb, pcb_millpath_cookie, "mill remove", &clr1);
 
 	if (result->res_remply == NULL)
-		result->res_remply = pcb_uilayer_alloc(pcb_millpath_cookie, "mill remain", &clr3);
+		result->res_remply = pcb_uilayer_alloc(pcb, pcb_millpath_cookie, "mill remain", &clr3);
 
 	if (result->res_path == NULL)
-		result->res_path = pcb_uilayer_alloc(pcb_millpath_cookie, "mill toolpath", &clr2);
+		result->res_path = pcb_uilayer_alloc(pcb, pcb_millpath_cookie, "mill toolpath", &clr2);
 
 	if (result->fill != NULL)
 		pcb_polyop_destroy(NULL, result->res_ply, result->fill);
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 34515)
+++ trunk/src_plugins/report/report.c	(revision 34516)
@@ -918,7 +918,7 @@
 	/* anything below needs the layer */
 
 	if (ly == NULL)
-		ly = pcb_uilayer_alloc("NetLength", "Net length", rnd_color_blue);
+		ly = pcb_uilayer_alloc(PCB_ACT_BOARD, "NetLength", "Net length", rnd_color_blue);
 
 	if (strcmp(cmd, "object") == 0) {
 		int type;
Index: trunk/src_plugins/sketch_route/sketch_route.c
===================================================================
--- trunk/src_plugins/sketch_route/sketch_route.c	(revision 34515)
+++ trunk/src_plugins/sketch_route/sketch_route.c	(revision 34516)
@@ -718,12 +718,12 @@
 	rnd_r_search(layer->arc_tree, &bbox, NULL, r_search_cb, &info, NULL);
 
 	rnd_snprintf(name, sizeof(name), "%s: CDT", layer->name);
-	sk->ui_layer_cdt = pcb_uilayer_alloc(pcb_sketch_route_cookie, name, &layer->meta.real.color);
+	sk->ui_layer_cdt = pcb_uilayer_alloc(PCB, pcb_sketch_route_cookie, name, &layer->meta.real.color);
 	sk->ui_layer_cdt->meta.real.vis = rnd_false;
 	sketch_update_cdt_layer(sk);
 
 	rnd_snprintf(name, sizeof(name), "%s: ERBS", layer->name);
-	sk->ui_layer_erbs = pcb_uilayer_alloc(pcb_sketch_route_cookie, name, &layer->meta.real.color);
+	sk->ui_layer_erbs = pcb_uilayer_alloc(PCB, pcb_sketch_route_cookie, name, &layer->meta.real.color);
 	sketch_update_erbs_layer(sk);
 	rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 }