Index: obj_poly.h
===================================================================
--- obj_poly.h	(revision 6121)
+++ obj_poly.h	(revision 6122)
@@ -89,7 +89,7 @@
 #define	PCB_POLY_ALL_LOOP(top)	do {		\
 	pcb_cardinal_t		l;			\
 	pcb_layer_t *layer = (top)->Layer;		\
-	for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++)	\
+	for (l = 0; l < pcb_max_layer; l++, layer++)	\
 	{ \
 		PCB_POLY_LOOP(layer)
 
@@ -111,7 +111,7 @@
 #define	PCB_POLY_VISIBLE_LOOP(top) do	{	\
 	pcb_cardinal_t		l;			\
 	pcb_layer_t *layer = (top)->Layer;		\
-	for (l = 0; l < pcb_max_copper_layer + 2; l++, layer++)	\
+	for (l = 0; l < pcb_max_layer; l++, layer++)	\
 	{ \
 		if (layer->On)				\
 			PCB_POLY_LOOP(layer)