--- ray/src/common/rglfile.c	2003/03/11 19:29:04	3.6
+++ ray/src/common/rglfile.c	2004/03/28 20:33:12	3.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rglfile.c,v 3.6 2003/03/11 19:29:04 greg Exp $";
+static const char	RCSid[] = "$Id: rglfile.c,v 3.11 2004/03/28 20:33:12 schorsch Exp $";
 #endif
 /*
  * Load Radiance object(s) and create OpenGL display lists
@@ -7,6 +7,9 @@ static const char	RCSid[] = "$Id: rglfile.c,v 3.6 2003
 
 #include "copyright.h"
 
+#include <ctype.h>
+
+#include "rtprocess.h"
 #include "radogl.h"
 
 #ifndef NLIST2ALLOC
@@ -18,8 +21,8 @@ FUN  ofun[NUMOTYPE] = INIT_OTYPE;
 static int	nextlist, nlistleft = 0;
 
 
-static void
-initotypes()			/* initialize ofun array */
+void
+initotypes(void)			/* initialize ofun array */
 {
 	if (ofun[OBJ_SPHERE].funp == o_sphere)
 		return;			/* already done */
@@ -34,6 +37,7 @@ initotypes()			/* initialize ofun array */
 	ofun[OBJ_RING].funp = o_ring;
 	ofun[OBJ_SOURCE].funp = o_source;
 	ofun[OBJ_INSTANCE].funp = o_instance;
+	ofun[OBJ_MESH].funp = o_unsupported;
 						/* assign material types */
 	ofun[MAT_TRANS].funp =
 	ofun[MAT_PLASTIC].funp =
@@ -117,7 +121,7 @@ int
 rgl_octlist(fname, cent, radp, nl)	/* load scen into display list */
 char	*fname;
 FVECT	cent;			/* returned octree center (optional) */
-FLOAT	*radp;			/* returned octree size (optional) */
+RREAL	*radp;			/* returned octree size (optional) */
 int	*nl;			/* returned number of lists (optional) */
 {
 	double	r;
@@ -147,7 +151,6 @@ void
 rgl_load(inpspec)		/* convert scene description into OGL calls */
 char	*inpspec;
 {
-	FILE	*popen();
 	char	*fgetline();
 	FILE	*infp;
 	char	buf[1024];