--- ray/src/rt/m_mirror.c	1995/08/26 15:15:51	2.5
+++ ray/src/rt/m_mirror.c	1998/08/10 18:37:05	2.7
@@ -1,7 +1,7 @@
-/* Copyright (c) 1995 Regents of the University of California */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static char SCCSid[] = "$SunId$ SGI";
 #endif
 
 /*
@@ -36,6 +36,7 @@ register RAY  *r;
 {
 	COLOR  mcolor;
 	RAY  nr;
+	int  rpure = 1;
 	register int  i;
 					/* check arguments */
 	if (m->oargs.nfargs != 3 || m->oargs.nsargs > 1)
@@ -47,7 +48,7 @@ register RAY  *r;
 			raytrans(r);
 			return(1);
 		}
-		return(rayshade(r, modifier(m->oargs.sarg[0])));
+		return(rayshade(r, lastmod(objndx(m), m->oargs.sarg[0])));
 	}
 					/* check for bad source ray */
 	if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
@@ -76,17 +77,22 @@ register RAY  *r;
 
 		if (rayorigin(&nr, r, REFLECTED, bright(mcolor)) < 0)
 			return(1);
-		pdot = raynormal(pnorm, r);	/* use textures */
-		for (i = 0; i < 3; i++)
-			nr.rdir[i] = r->rdir[i] + 2.*pdot*pnorm[i];
+		if (DOT(r->pert,r->pert) > FTINY*FTINY) {
+			pdot = raynormal(pnorm, r);	/* use textures */
+			for (i = 0; i < 3; i++)
+				nr.rdir[i] = r->rdir[i] + 2.*pdot*pnorm[i];
+			rpure = 0;
+		}
 						/* check for penetration */
-		if (DOT(nr.rdir, r->ron) <= FTINY)
+		if (rpure || DOT(nr.rdir, r->ron) <= FTINY)
 			for (i = 0; i < 3; i++)
 				nr.rdir[i] = r->rdir[i] + 2.*r->rod*r->ron[i];
 	}
 	rayvalue(&nr);
 	multcolor(nr.rcol, mcolor);
 	addcolor(r->rcol, nr.rcol);
+	if (rpure && r->ro != NULL && isflat(r->ro->otype))
+		r->rt = r->rot + nr.rt;
 	return(1);
 }