--- ray/src/util/rad.c	1993/05/26 11:37:42	2.9
+++ ray/src/util/rad.c	1993/07/15 18:32:57	2.14
@@ -105,6 +105,7 @@ extern long	fdate(), time();
 
 long	scenedate;		/* date of latest scene or object file */
 long	octreedate;		/* date of octree */
+long	matdate;		/* date of latest material file */
 
 int	explicate = 0;		/* explicate variables */
 int	silent = 0;		/* do work silently */
@@ -423,6 +424,9 @@ checkfiles()			/* check for existence and modified tim
 				vnam(OCTREE), vnam(SCENE));
 		exit(1);
 	}
+	matdate = -1;
+	if (vdef(MATERIAL))
+		matdate = checklast(vval(MATERIAL));
 }	
 
 
@@ -561,11 +565,12 @@ checkambfile()			/* check date on ambient file */
 {
 	long	afdate;
 
-	if (vdef(AMBFILE)) {
-		afdate = fdate(vval(AMBFILE));
-		if (afdate >= 0 & octreedate > afdate)
-			rmfile(vval(AMBFILE));
-	}
+	if (!vdef(AMBFILE))
+		return;
+	if ((afdate = fdate(vval(AMBFILE))) < 0)
+		return;
+	if (octreedate > afdate | matdate > afdate)
+		rmfile(vval(AMBFILE));
 }
 
 
@@ -784,17 +789,21 @@ xferopts(ro)				/* transfer options if indicated */
 char	*ro;
 {
 	int	fd, n;
+	register char	*cp;
 	
 	n = strlen(ro);
 	if (n < 2)
 		return;
 	if (vdef(OPTFILE)) {
-		if ((fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1)
+		for (cp = ro; cp[1]; cp++)
+			if (isspace(cp[1]) && cp[2] == '-' && isalpha(cp[3]))
+				*cp = '\n';
+			else
+				*cp = cp[1];
+		*cp = '\n';
+		fd = open(vval(OPTFILE), O_WRONLY|O_CREAT|O_TRUNC, 0666);
+		if (fd < 0 || write(fd, ro, n) != n || close(fd) < 0)
 			syserr(vval(OPTFILE));
-		if (write(fd, ro+1, n-1) != n-1)
-			syserr(vval(OPTFILE));
-		write(fd, "\n", 1);
-		close(fd);
 		sprintf(ro, " \"^%s\"", vval(OPTFILE));
 	}
 #ifdef MSDOS
@@ -814,8 +823,14 @@ register char	*po;
 		po = addarg(po, "-1 -e");
 		po = addarg(po, vval(EXPOSURE));
 	}
-	if (vscale(QUALITY) == HIGH)
-		po = addarg(po, "-r .65");
+	switch (vscale(QUALITY)) {
+	case MEDIUM:
+		po = addarg(po, "-r 1");
+		break;
+	case HIGH:
+		po = addarg(po, "-m .25");
+		break;
+	}
 	if (vdef(PFILT))
 		po = addarg(po, vval(PFILT));
 }
@@ -1011,6 +1026,7 @@ char	*opts;
 	char	pfopts[128];
 	char	vs[32], *vw;
 	int	vn, mult;
+	long	lastdate;
 					/* get pfilt options */
 	pfiltopts(pfopts);
 					/* get resolution, reporting */
@@ -1041,6 +1057,8 @@ char	*opts;
 		else
 			badvalue(REPORT);
 	}
+					/* get update time */
+	lastdate = octreedate > matdate ? octreedate : matdate;
 					/* do each view */
 	vn = 0;
 	while ((vw = getview(vn++, vs)) != NULL) {
@@ -1048,11 +1066,11 @@ char	*opts;
 			sprintf(vs, "%d", vn);
 		sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
 						/* check date on picture */
-		if (fdate(picfile) > octreedate)
+		if (fdate(picfile) >= lastdate)
 			continue;
 						/* build rpict command */
 		sprintf(rawfile, "%s_%s.raw", vval(PICTURE), vs);
-		if (fdate(rawfile) > octreedate)	/* recover */
+		if (fdate(rawfile) >= octreedate)	/* recover */
 			sprintf(combuf, "rpict%s%s -ro %s %s",
 					rep, opts, rawfile, vval(OCTREE));
 		else {