--- ray/src/rt/glass.c	1996/06/06 10:23:28	2.9
+++ ray/src/rt/glass.c	2003/07/27 22:12:03	2.14
@@ -1,15 +1,12 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: glass.c,v 2.14 2003/07/27 22:12:03 schorsch Exp $";
 #endif
-
 /*
  *  glass.c - simpler shading function for thin glass surfaces.
- *
- *     11/14/86
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
 #include  "otypes.h"
@@ -69,15 +66,16 @@ register RAY  *r;
 
 	setcolor(mcolor, m->oargs.farg[0], m->oargs.farg[1], m->oargs.farg[2]);
 
+						/* get modifiers */
+	raytexture(r, m->omod);
 	if (r->rod < 0.0)			/* reorient if necessary */
 		flipsurface(r);
 	mirtest = transtest = 0;
 	mirdist = transdist = r->rot;
-						/* get modifiers */
-	raytexture(r, m->omod);
-	if (hastexture = DOT(r->pert,r->pert) > FTINY*FTINY)
+						/* perturb normal */
+	if ( (hastexture = (DOT(r->pert,r->pert) > FTINY*FTINY)) ) {
 		pdot = raynormal(pnorm, r);
-	else {
+	} else {
 		VCOPY(pnorm, r->ron);
 		pdot = r->rod;
 	}