--- ray/src/rt/normal.c	1992/04/16 13:31:28	2.13
+++ ray/src/rt/normal.c	1992/04/22 09:05:30	2.15
@@ -108,7 +108,7 @@ double  omega;			/* light source size */
 						/* worth using? */
 		if (dtmp > FTINY) {
 			copycolor(ctmp, np->scolor);
-			dtmp *= omega / np->pdot;
+			dtmp *= omega * sqrt(ldot/np->pdot);
 			scalecolor(ctmp, dtmp);
 			addcolor(cval, ctmp);
 		}
@@ -134,7 +134,7 @@ double  omega;			/* light source size */
 						/* worth using? */
 		if (dtmp > FTINY) {
 			copycolor(ctmp, np->mcolor);
-			dtmp *= np->tspec * omega / np->pdot;
+			dtmp *= np->tspec * omega * sqrt(ldot/np->pdot);
 			scalecolor(ctmp, dtmp);
 			addcolor(cval, ctmp);
 		}
@@ -186,13 +186,14 @@ register RAY  *r;
 		else
 			setcolor(nd.scolor, 1.0, 1.0, 1.0);
 		scalecolor(nd.scolor, nd.rspec);
-		if (nd.specfl & SP_PURE) {		/* improved model */
-			dtmp = exp(-BSPEC(m)*nd.pdot);
-			for (i = 0; i < 3; i++)
-				colval(nd.scolor,i) +=
-						(1.0-colval(nd.scolor,i))*dtmp;
-			nd.rspec += (1.0-nd.rspec)*dtmp;
-		} else if (specthresh > FTINY &&	/* check threshold */
+						/* improved model */
+		dtmp = exp(-BSPEC(m)*nd.pdot);
+		for (i = 0; i < 3; i++)
+			colval(nd.scolor,i) += (1.0-colval(nd.scolor,i))*dtmp;
+		nd.rspec += (1.0-nd.rspec)*dtmp;
+						/* check threshold */
+		if (!(nd.specfl & SP_PURE) &&
+				specthresh > FTINY &&
 				(specthresh >= 1.-FTINY ||
 				specthresh > nd.rspec))
 			nd.specfl |= SP_RBLT;