--- ray/src/common/rglfile.c	2003/02/25 02:47:22	3.5
+++ ray/src/common/rglfile.c	2003/04/23 02:28:06	3.7
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rglfile.c,v 3.5 2003/02/25 02:47:22 greg Exp $";
+static const char	RCSid[] = "$Id: rglfile.c,v 3.7 2003/04/23 02:28:06 greg Exp $";
 #endif
 /*
  * Load Radiance object(s) and create OpenGL display lists
@@ -34,6 +34,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 =
@@ -198,16 +199,14 @@ FILE  *fp;
 	strcpy(sbuf, "EOF");
 	fgetword(sbuf, MAXSTR, fp);
 	ob.omod = 0;			/* use ob.os for pointer to material */
-	if (!strcmp(sbuf, VOIDID))
+	if (!strcmp(sbuf, VOIDID) || !strcmp(sbuf, ALIASMOD))
 		ob.os = NULL;
 	else
 		ob.os = (char *)getmatp(sbuf);
 					/* get type */
 	strcpy(sbuf, "EOF");
 	fgetword(sbuf, MAXSTR, fp);
-	if (!strcmp(sbuf, ALIASID))
-		ob.otype = -1;
-	else if ((ob.otype = otype(sbuf)) < 0) {
+	if ((ob.otype = otype(sbuf)) < 0) {
 		sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
 		error(USER, errmsg);
 	}
@@ -216,7 +215,7 @@ FILE  *fp;
 	fgetword(sbuf, MAXSTR, fp);
 	ob.oname = sbuf;
 					/* get arguments */
-	if (ob.otype == -1) {
+	if (ob.otype == MOD_ALIAS) {
 		char  sbuf2[MAXSTR];		/* get alias */
 		strcpy(sbuf2, "EOF");
 		fgetword(sbuf2, MAXSTR, fp);