Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 27522)
+++ trunk/src/draw.c	(revision 27523)
@@ -117,7 +117,7 @@
 	double dx = x2-x1, dy = y2-y1;
 	double len_mnt = PCB_ABS(dx) + PCB_ABS(dy);
 	int n;
-	pcb_coord_t minlen = pcb_gui->coord_per_pix * 8;
+	pcb_coord_t minlen = pcb_render->coord_per_pix * 8;
 
 	/* Ignore info->xform->bloat because a dashed line is always thin */
 
Index: trunk/src/obj_poly_draw_helper.c
===================================================================
--- trunk/src/obj_poly_draw_helper.c	(revision 27522)
+++ trunk/src/obj_poly_draw_helper.c	(revision 27523)
@@ -45,7 +45,7 @@
 		last_x = pl->head.point[0]; \
 		last_y = pl->head.point[1]; \
 		v = pl->head.next; \
-		mindist = pcb_gui->coord_per_pix * 2; \
+		mindist = pcb_render->coord_per_pix * 2; \
 
 /* call this before drawing the next vertex */
 #define vert_opt_loop1(v, force, skip_stmt) \
@@ -88,7 +88,7 @@
 	vert_opt_begin();
 	do {
 		vert_opt_loop1(v, first, continue);
-		if (pcb_gui->gui)
+		if (pcb_render->gui)
 			first = 0; /* if gui, turn on optimization and start to omit vertices */
 		fc_x[i] = this_x;
 		fc_y[i++] = this_y;
Index: trunk/src/obj_pstk.c
===================================================================
--- trunk/src/obj_pstk.c	(revision 27522)
+++ trunk/src/obj_pstk.c	(revision 27523)
@@ -589,18 +589,18 @@
 		mark += proto->hdia/2;
 
 	mark2 = mark*2;
-	if (mark2 < pcb_gui->coord_per_pix)
+	if (mark2 < pcb_render->coord_per_pix)
 		return PCB_R_DIR_FOUND_CONTINUE;
 
 	/* draw the cross using xor */
 	set_ps_annot_color(pcb_draw_out.fgGC, ps);
 	pcb_hid_set_line_width(pcb_draw_out.fgGC, 0);
-	if (mark2 > pcb_gui->coord_per_pix*3) {
+	if (mark2 > pcb_render->coord_per_pix*3) {
 		pcb_render->draw_line(pcb_draw_out.fgGC, ps->x-mark, ps->y, ps->x+mark, ps->y);
 		pcb_render->draw_line(pcb_draw_out.fgGC, ps->x, ps->y-mark, ps->x, ps->y+mark);
 	}
 	else
-		pcb_render->draw_line(pcb_draw_out.fgGC, ps->x-pcb_gui->coord_per_pix, ps->y, ps->x+pcb_gui->coord_per_pix, ps->y);
+		pcb_render->draw_line(pcb_draw_out.fgGC, ps->x-pcb_render->coord_per_pix, ps->y, ps->x+pcb_render->coord_per_pix, ps->y);
 
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 27522)
+++ trunk/src/obj_text.c	(revision 27523)
@@ -1045,11 +1045,11 @@
 {
 	pcb_coord_t w, h = PCB_SCALE_TEXT(font->MaxHeight, scale);
 	if (tiny == PCB_TXT_TINY_HIDE) {
-		if (h <= pcb_gui->coord_per_pix*6) /* <= 6 pixel high: unreadable */
+		if (h <= pcb_render->coord_per_pix*6) /* <= 6 pixel high: unreadable */
 			return 1;
 	}
 	else if (tiny == PCB_TXT_TINY_CHEAP) {
-		if (h <= pcb_gui->coord_per_pix*2) { /* <= 1 pixel high: draw a single line in the middle */
+		if (h <= pcb_render->coord_per_pix*2) { /* <= 1 pixel high: draw a single line in the middle */
 			w = pcb_text_width(font, scale, string);
 			if (xordraw) {
 				cheap_text_line(pcb_crosshair.GC, mx, 0, h/2, w, h/2, xordx, xordy);
@@ -1061,7 +1061,7 @@
 			}
 			return 1;
 		}
-		else if (h <= pcb_gui->coord_per_pix*4) { /* <= 4 pixel high: draw a mirrored Z-shape */
+		else if (h <= pcb_render->coord_per_pix*4) { /* <= 4 pixel high: draw a mirrored Z-shape */
 			w = pcb_text_width(font, scale, string);
 			if (xordraw) {
 				h /= 4;