Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 28841)
+++ trunk/src/obj_arc.c	(revision 28842)
@@ -63,8 +63,8 @@
 	if (layer->parent_type == PCB_PARENT_UI)
 		return;
 
-	assert(layer->parent_type == PCB_PARENT_DATA);
-	pcb_obj_id_reg(layer->parent.data, arc);
+	if (layer->parent_type == PCB_PARENT_DATA)
+		pcb_obj_id_reg(layer->parent.data, arc);
 }
 
 void pcb_arc_unreg(pcb_arc_t *arc)
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 28841)
+++ trunk/src/obj_line.c	(revision 28842)
@@ -69,8 +69,8 @@
 	if (layer->parent_type == PCB_PARENT_UI)
 		return;
 
-	assert(layer->parent_type == PCB_PARENT_DATA);
-	pcb_obj_id_reg(layer->parent.data, line);
+	if (layer->parent_type == PCB_PARENT_DATA)
+		pcb_obj_id_reg(layer->parent.data, line);
 }
 
 void pcb_line_unreg(pcb_line_t *line)
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 28841)
+++ trunk/src/obj_poly.c	(revision 28842)
@@ -69,8 +69,8 @@
 	if (layer->parent_type == PCB_PARENT_UI)
 		return;
 
-	assert(layer->parent_type == PCB_PARENT_DATA);
-	pcb_obj_id_reg(layer->parent.data, poly);
+	if (layer->parent_type == PCB_PARENT_DATA)
+		pcb_obj_id_reg(layer->parent.data, poly);
 }
 
 void pcb_poly_unreg(pcb_poly_t *poly)
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 28841)
+++ trunk/src/obj_text.c	(revision 28842)
@@ -67,8 +67,8 @@
 	if (layer->parent_type == PCB_PARENT_UI)
 		return;
 
-	assert(layer->parent_type == PCB_PARENT_DATA);
-	pcb_obj_id_reg(layer->parent.data, text);
+	if (layer->parent_type == PCB_PARENT_DATA)
+		pcb_obj_id_reg(layer->parent.data, text);
 }
 
 void pcb_text_unreg(pcb_text_t *text)