--- ray/src/rt/raytrace.c	1996/04/17 14:06:35	2.26
+++ ray/src/rt/raytrace.c	1997/12/23 18:25:15	2.29
@@ -96,12 +96,12 @@ register RAY  *r;
 {
 	r->rno = raynum++;
 	r->newcset = r->clipset;
+	r->robj = OVOID;
 	r->ro = NULL;
-	r->rot = FHUGE;
+	r->rt = r->rot = FHUGE;
 	r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
 	setcolor(r->pcol, 1.0, 1.0, 1.0);
 	setcolor(r->rcol, 0.0, 0.0, 0.0);
-	r->rt = 0.0;
 }
 
 
@@ -189,16 +189,13 @@ rayparticipate(r)			/* compute ray medium participatio
 register RAY  *r;
 {
 	COLOR	ce, ca;
-	double	dist;
 	double	re, ge, be;
 
 	if (intens(r->cext) <= 1./FHUGE)
 		return;				/* no medium */
-	if ((dist = r->rot) >= FHUGE)
-		dist = 2.*thescene.cusize;	/* what to use for infinity? */
-	re = dist*colval(r->cext,RED);
-	ge = dist*colval(r->cext,GRN);
-	be = dist*colval(r->cext,BLU);
+	re = r->rot*colval(r->cext,RED);
+	ge = r->rot*colval(r->cext,GRN);
+	be = r->rot*colval(r->cext,BLU);
 	if (r->crtype & SHADOW) {		/* no scattering for sources */
 		re *= 1. - colval(r->albedo,RED);
 		ge *= 1. - colval(r->albedo,GRN);
@@ -557,7 +554,8 @@ OBJECT  *cxs;
 	checkset(oset, cxs);			/* eliminate double-checking */
 	for (i = oset[0]; i > 0; i--) {
 		o = objptr(oset[i]);
-		(*ofun[o->otype].funp)(o, r);
+		if ((*ofun[o->otype].funp)(o, r))
+			r->robj = oset[i];
 	}
 	if (r->ro == NULL)
 		return(0);			/* no scores yet */