Index: shape.c
===================================================================
--- shape.c	(revision 37953)
+++ shape.c	(revision 37954)
@@ -284,7 +284,7 @@
 	if (data != PCB->Data) {
 		pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
 		pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_POLY, PCB_CURRLAYER(PCB), p, p);
-		rnd_r_delete_entry(PCB_CURRLAYER(PCB)->polygon_tree, (rnd_box_t *)p);
+		rnd_rtree_delete(PCB_CURRLAYER(PCB)->polygon_tree, p, (rnd_rtree_box_t *)p);
 		pcb_poly_free_fields(p);
 		pcb_poly_free(p);
 		rnd_tool_select_by_name(&PCB->hidlib, "buffer");
@@ -333,7 +333,7 @@
 		if (data != PCB->Data) {
 			pcb_buffer_clear(PCB, PCB_PASTEBUFFER);
 			pcb_copy_obj_to_buffer(PCB, data, PCB->Data, PCB_OBJ_LINE, PCB_CURRLAYER(PCB), l, l);
-			rnd_r_delete_entry(PCB_CURRLAYER(PCB)->line_tree, (rnd_box_t *)l);
+			rnd_rtree_delete(PCB_CURRLAYER(PCB)->line_tree, l, (rnd_rtree_box_t *)l);
 			pcb_line_free(l);
 			rnd_tool_select_by_name(&PCB->hidlib, "buffer");
 		}