Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 37936)
+++ trunk/src/obj_arc.c	(revision 37937)
@@ -348,7 +348,7 @@
 {
 	pcb_arc_bbox(Arc);
 	if (!Layer->arc_tree)
-		Layer->arc_tree = rnd_r_create_tree();
+		rnd_rtree_init(Layer->arc_tree = malloc(sizeof(rnd_rtree_t)));
 	rnd_rtree_insert(Layer->arc_tree, Arc, (rnd_rtree_box_t *)Arc);
 	Arc->type = PCB_OBJ_ARC;
 	PCB_SET_PARENT(Arc, layer, Layer);
@@ -542,7 +542,7 @@
 	PCB_FLAG_CLEAR(PCB_FLAG_FOUND, arc);
 
 	if (!dstly->arc_tree)
-		dstly->arc_tree = rnd_r_create_tree();
+		rnd_rtree_init(dstly->arc_tree = malloc(sizeof(rnd_rtree_t)));
 	rnd_rtree_insert(dstly->arc_tree, arc, (rnd_rtree_box_t *)arc);
 	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_ARC, dstly, arc);
 
@@ -780,7 +780,7 @@
 	pcb_arc_reg(Destination, arc);
 
 	if (!Destination->arc_tree)
-		Destination->arc_tree = rnd_r_create_tree();
+		rnd_rtree_init(Destination->arc_tree = malloc(sizeof(rnd_rtree_t)));
 	rnd_rtree_insert(Destination->arc_tree, arc, (rnd_rtree_box_t *)arc);
 
 	return arc;
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 37936)
+++ trunk/src/obj_line.c	(revision 37937)
@@ -568,7 +568,7 @@
 {
 	pcb_line_bbox(Line);
 	if (!Layer->line_tree)
-		Layer->line_tree = rnd_r_create_tree();
+		rnd_rtree_init(Layer->line_tree = malloc(sizeof(rnd_rtree_t)));
 	rnd_rtree_insert(Layer->line_tree, Line, (rnd_rtree_box_t *)Line);
 	Line->parent.layer = Layer;
 	Line->parent_type = PCB_PARENT_LAYER;
@@ -740,7 +740,7 @@
 	PCB_FLAG_CLEAR(PCB_FLAG_FOUND, line);
 
 	if (!dstly->line_tree)
-		dstly->line_tree = rnd_r_create_tree();
+		rnd_rtree_init(dstly->line_tree = malloc(sizeof(rnd_rtree_t)));
 	rnd_rtree_insert(dstly->line_tree, line, (rnd_rtree_box_t *)line);
 	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_LINE, dstly, line);
 
@@ -975,7 +975,7 @@
 	pcb_line_reg(Destination, line);
 
 	if (!Destination->line_tree)
-		Destination->line_tree = rnd_r_create_tree();
+		rnd_rtree_init(Destination->line_tree = malloc(sizeof(rnd_rtree_t)));
 	rnd_rtree_insert(Destination->line_tree, line, (rnd_rtree_box_t *)line);
 
 	return line;