Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 36045)
+++ trunk/src_plugins/export_png/png.c	(revision 36046)
@@ -807,6 +807,8 @@
 	if (flags & PCB_LYT_UI)
 		return 0;
 
+	is_photo_drill = is_photo_mech = 0;
+
 	pcb_cam_set_layer_group(&png_cam, group, purpose, purpi, flags, xform);
 	if (png_cam.fn_changed) {
 		if (f != NULL) {
@@ -950,7 +952,7 @@
 	if (color == NULL)
 		color = rnd_color_red;
 
-	if (rnd_color_is_drill(color)) {
+	if (rnd_color_is_drill(color) || is_photo_mech) {
 		gc->color = white;
 		gc->is_erase = 1;
 		return;
Index: trunk/src_plugins/export_png/png_photo1.c
===================================================================
--- trunk/src_plugins/export_png/png_photo1.c	(revision 36045)
+++ trunk/src_plugins/export_png/png_photo1.c	(revision 36046)
@@ -36,7 +36,7 @@
 static int photo_groups[PCB_MAX_LAYERGRP + 2], photo_ngroups;
 static int photo_has_inners;
 static rnd_layergrp_id_t photo_last_grp;
-static int is_photo_drill;
+static int is_photo_drill, is_photo_mech;
 
 static const char *mask_colour_names[] = {
 	"green",
Index: trunk/src_plugins/export_png/png_photo2.c
===================================================================
--- trunk/src_plugins/export_png/png_photo2.c	(revision 36045)
+++ trunk/src_plugins/export_png/png_photo2.c	(revision 36046)
@@ -137,7 +137,8 @@
 	else
 		doing_outline = 0;
 
-	is_photo_drill = (PCB_LAYER_IS_DRILL(flags, purpi) || ((flags & PCB_LYT_MECH) && PCB_LAYER_IS_ROUTE(flags, purpi)));
+	is_photo_mech = ((flags & PCB_LYT_MECH) && PCB_LAYER_IS_ROUTE(flags, purpi));
+	is_photo_drill = (PCB_LAYER_IS_DRILL(flags, purpi) || is_photo_mech);
 	if (((flags & PCB_LYT_ANYTHING) == PCB_LYT_SILK) && (flags & PCB_LYT_TOP)) {
 		if (photo_flip)
 			return 0;