Index: layer.c
===================================================================
--- layer.c	(revision 30979)
+++ layer.c	(revision 30980)
@@ -1451,7 +1451,7 @@
 	assert((vid >= 0) && (vid < PCB_VLY_end));
 
 	/* if there's no renderer, that means no draw should be done */
-	if (pcb_render == NULL)
+	if (rnd_render == NULL)
 		return 0;
 
 	if (xform != NULL)
@@ -1458,11 +1458,11 @@
 		*xform = NULL;
 
 TODO("layer: need to pass the flags of the group, not the flags of the layer once we have a group for each layer")
-	if (pcb_render->set_layer_group != NULL) {
+	if (rnd_render->set_layer_group != NULL) {
 		rnd_layergrp_id_t grp;
 		rnd_layer_id_t lid = v->new_id;
 		grp = pcb_layer_get_group(pcb, lid);
-		return pcb_render->set_layer_group(pcb_render, grp, v->purpose, v->purpi, lid, v->type, is_empty, xform);
+		return rnd_render->set_layer_group(rnd_render, grp, v->purpose, v->purpi, lid, v->type, is_empty, xform);
 	}
 
 	/* if the GUI doesn't have a set_layer, assume it wants to draw all layers */
@@ -1472,14 +1472,14 @@
 int pcb_layer_gui_set_g_ui(pcb_layer_t *first, int is_empty, rnd_xform_t **xform)
 {
 	/* if there's no renderer, that means no draw should be done */
-	if (pcb_render == NULL)
+	if (rnd_render == NULL)
 		return 0;
 
 	if (xform != NULL)
 		*xform = NULL;
 
-	if (pcb_render->set_layer_group != NULL)
-		return pcb_render->set_layer_group(pcb_render, -1, NULL, -1, pcb_layer_id(first->parent.data, first), PCB_LYT_VIRTUAL | PCB_LYT_UI, is_empty, xform);
+	if (rnd_render->set_layer_group != NULL)
+		return rnd_render->set_layer_group(rnd_render, -1, NULL, -1, pcb_layer_id(first->parent.data, first), PCB_LYT_VIRTUAL | PCB_LYT_UI, is_empty, xform);
 
 	/* if the GUI doesn't have a set_layer, assume it wants to draw all layers */
 	return 1;
@@ -1488,7 +1488,7 @@
 void pcb_layer_edit_attrib(pcb_layer_t *layer)
 {
 	char *buf = pcb_strdup_printf("Layer %s Attributes", layer->name);
-	pcb_gui->edit_attributes(pcb_gui, buf, &(layer->Attributes));
+	rnd_gui->edit_attributes(rnd_gui, buf, &(layer->Attributes));
 	free(buf);
 }