--- ray/src/cv/mgf2rad.c	1995/05/11 21:49:05	2.19
+++ ray/src/cv/mgf2rad.c	1996/02/27 20:11:27	2.21
@@ -1,4 +1,4 @@
-/* Copyright (c) 1995 Regents of the University of California */
+/* Copyright (c) 1996 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -33,7 +33,7 @@ main(argc, argv)		/* convert files to stdout */
 int	argc;
 char	*argv[];
 {
-	int	i, rv;
+	int	i;
 				/* print out parser version */
 	printf("## Translated from MGF Version %d.%d\n", MG_VMAJOR, MG_VMINOR);
 				/* initialize dispatch table */
@@ -94,7 +94,7 @@ char	*argv[];
 	}
 	putchar('\n');
 	if (i == argc) {		/* convert stdin */
-		if ((rv = mg_load(NULL)) != MG_OK)
+		if (mg_load(NULL) != MG_OK)
 			exit(1);
 		if (mg_nunknown)
 			printf("## %s: %u unknown entities\n",
@@ -103,7 +103,7 @@ char	*argv[];
 		for ( ; i < argc; i++) {
 			printf("## %s %s ##############################\n",
 					argv[0], argv[i]);
-			if ((rv = mg_load(argv[i])) != MG_OK)
+			if (mg_load(argv[i]) != MG_OK)
 				exit(1);
 			if (mg_nunknown) {
 				printf("## %s %s: %u unknown entities\n",
@@ -539,8 +539,7 @@ material()			/* get (and print) current material */
 		return(mname);
 	}
 					/* check for plastic */
-	if (c_cmaterial->rs < .1 && (c_cmaterial->rs < .01 ||
-					c_isgrey(&c_cmaterial->rs_c))) {
+	if (c_cmaterial->rs < .1) {
 		cvtcolor(radrgb, &c_cmaterial->rd_c,
 					c_cmaterial->rd/(1.-c_cmaterial->rs));
 		fprintf(matfp, "\nvoid plastic %s\n0\n0\n", mname);