Index: toolpath.c
===================================================================
--- toolpath.c	(revision 31039)
+++ toolpath.c	(revision 31040)
@@ -137,25 +137,25 @@
 	pcb_text_t *text;
 	sub_layer_text_t slt;
 
-	for(line = (pcb_line_t *)pcb_r_first(layer->line_tree, &it); line != NULL; line = (pcb_line_t *)pcb_r_next(&it))
+	for(line = (pcb_line_t *)rnd_r_first(layer->line_tree, &it); line != NULL; line = (pcb_line_t *)rnd_r_next(&it))
 		sub_layer_line(pcb, result, layer, line, centerline);
-	pcb_r_end(&it);
+	rnd_r_end(&it);
 
-	for(arc = (pcb_arc_t *)pcb_r_first(layer->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)pcb_r_next(&it))
+	for(arc = (pcb_arc_t *)rnd_r_first(layer->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)rnd_r_next(&it))
 		sub_layer_arc(pcb, result, layer, arc, centerline);
-	pcb_r_end(&it);
+	rnd_r_end(&it);
 
-	for(poly = (pcb_poly_t *)pcb_r_first(layer->polygon_tree, &it); poly != NULL; poly = (pcb_poly_t *)pcb_r_next(&it))
+	for(poly = (pcb_poly_t *)rnd_r_first(layer->polygon_tree, &it); poly != NULL; poly = (pcb_poly_t *)rnd_r_next(&it))
 		sub_layer_poly(pcb, result, layer, poly, centerline);
-	pcb_r_end(&it);
+	rnd_r_end(&it);
 
 	slt.pcb = pcb;
 	slt.layer = layer;
 	slt.centerline = centerline;
 	slt.result = result;
-	for(text = (pcb_text_t *)pcb_r_first(layer->text_tree, &it); text != NULL; text = (pcb_text_t *)pcb_r_next(&it))
+	for(text = (pcb_text_t *)rnd_r_first(layer->text_tree, &it); text != NULL; text = (pcb_text_t *)rnd_r_next(&it))
 		pcb_text_decompose_text(NULL, text, sub_layer_text, &slt);
-	pcb_r_end(&it);
+	rnd_r_end(&it);
 
 }
 
@@ -175,13 +175,13 @@
 	pcb_pstk_t *ps, ps_tmp;
 	rnd_rtree_it_t it;
 
-	for(ps = (pcb_pstk_t *)pcb_r_first(pcb->Data->padstack_tree, &it); ps != NULL; ps = (pcb_pstk_t *)pcb_r_next(&it)) {
+	for(ps = (pcb_pstk_t *)rnd_r_first(pcb->Data->padstack_tree, &it); ps != NULL; ps = (pcb_pstk_t *)rnd_r_next(&it)) {
 		memcpy(&ps_tmp, ps, sizeof(ps_tmp));
 		ps_tmp.Clearance = 1;
 		ps_tmp.thermals.used = 0;
 		pcb_poly_sub_obj(pcb->Data, layer, result->fill, PCB_OBJ_PSTK, &ps_tmp);
 	}
-	pcb_r_end(&it);
+	rnd_r_end(&it);
 }
 
 static void setup_ui_layers(pcb_board_t *pcb, pcb_tlp_session_t *result, pcb_layergrp_t *grp)
@@ -253,13 +253,13 @@
 			if (l == NULL)
 				continue;
 
-			for(line = (pcb_line_t *)pcb_r_first(l->line_tree, &it); line != NULL; line = (pcb_line_t *)pcb_r_next(&it))
+			for(line = (pcb_line_t *)rnd_r_first(l->line_tree, &it); line != NULL; line = (pcb_line_t *)rnd_r_next(&it))
 				rnd_box_bump_box(&otlbb, (rnd_rnd_box_t *)line);
-			pcb_r_end(&it);
+			rnd_r_end(&it);
 
-			for(arc = (pcb_arc_t *)pcb_r_first(l->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)pcb_r_next(&it))
+			for(arc = (pcb_arc_t *)rnd_r_first(l->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)rnd_r_next(&it))
 				rnd_box_bump_box(&otlbb, (rnd_rnd_box_t *)arc);
-			pcb_r_end(&it);
+			rnd_r_end(&it);
 		}
 		result->fill = pcb_poly_new_from_rectangle(result->res_ply, otlbb.X1, otlbb.Y1, otlbb.X2, otlbb.Y2, 0, pcb_flag_make(PCB_FLAG_FULLPOLY));
 		result->remain = pcb_poly_new_from_rectangle(result->res_remply, otlbb.X1, otlbb.Y1, otlbb.X2, otlbb.Y2, 0, pcb_flag_make(PCB_FLAG_FULLPOLY));