--- ray/src/rt/rvmain.c	2011/10/05 17:20:55	2.11
+++ ray/src/rt/rvmain.c	2015/02/24 19:39:27	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rvmain.c,v 2.11 2011/10/05 17:20:55 greg Exp $";
+static const char	RCSid[] = "$Id: rvmain.c,v 2.12 2015/02/24 19:39:27 greg Exp $";
 #endif
 /*
  *  rvmain.c - main for rview interactive viewer
@@ -18,6 +18,7 @@ static const char	RCSid[] = "$Id: rvmain.c,v 2.11 2011
 #include  "random.h"
 #include  "paths.h"
 #include  "view.h"
+#include  "pmapray.h"
 
 extern char  *progname;			/* global argv[0] */
 
@@ -228,11 +229,17 @@ main(int argc, char *argv[])
 	SET_FILE_BINARY(stdout);
 	
 	ray_init(octnm);
+	
+	/* PMAP: set up & load photon maps */
+	ray_init_pmap();
 
 	rview();			/* run interactive viewer */
 
 	devclose();			/* close output device */
 
+	/* PMAP: free photon maps */
+	ray_done_pmap();
+	
 	quit(0);
 
 badopt: