--- ray/src/cv/mgf2rad.c 1995/11/22 15:38:04 2.20 +++ ray/src/cv/mgf2rad.c 1996/06/06 11:49:53 2.22 @@ -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"; @@ -348,7 +348,9 @@ char **av; if (ac < 2) return(MG_EARGC); /* construct output file name */ - if ((op = strrchr(av[1], '/')) == NULL) + if ((op = strrchr(av[1], '/')) != NULL) + op++; + else op = av[1]; (void)strcpy(fname, op); if ((op = strrchr(fname, '.')) == NULL) @@ -539,8 +541,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);