--- ray/src/rt/raytrace.c	2003/03/11 19:29:05	2.38
+++ ray/src/rt/raytrace.c	2003/09/09 03:28:43	2.43
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: raytrace.c,v 2.38 2003/03/11 19:29:05 greg Exp $";
+static const char RCSid[] = "$Id: raytrace.c,v 2.43 2003/09/09 03:28:43 greg Exp $";
 #endif
 /*
  *  raytrace.c - routines for tracing and shading rays.
@@ -20,7 +20,7 @@ static const char RCSid[] = "$Id: raytrace.c,v 2.38 20
 unsigned long  raynum = 0;		/* next unique ray number */
 unsigned long  nrays = 0;		/* number of calls to localhit */
 
-static FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
+static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
 OBJREC  Lamb = {
 	OVOID, MAT_PLASTIC, "Lambertian",
 	{0, 5, NULL, Lambfa}, NULL,
@@ -175,6 +175,7 @@ int  mod;
 		******/
 					/* hack for irradiance calculation */
 		if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&
+				m->otype != MAT_CLIP &&
 				(ofun[m->otype].flags & (T_M|T_X))) {
 			if (irr_ignore(m->otype)) {
 #if  MAXLOOP
@@ -228,9 +229,10 @@ register RAY  *r;
 }
 
 
+void
 raytexture(r, mod)			/* get material modifiers */
 RAY  *r;
-int  mod;
+OBJECT  mod;
 {
 	register OBJREC  *m;
 #if  MAXLOOP
@@ -277,19 +279,20 @@ double  coef;
 					/* compute foreground and background */
 	foremat = backmat = 0;
 					/* foreground */
-	copystruct(&fr, r);
+	fr = *r;
 	if (coef > FTINY)
 		foremat = rayshade(&fr, fore);
 					/* background */
-	copystruct(&br, r);
+	br = *r;
 	if (coef < 1.0-FTINY)
 		backmat = rayshade(&br, back);
 					/* check for transparency */
-	if (backmat ^ foremat)
+	if (backmat ^ foremat) {
 		if (backmat && coef > FTINY)
 			raytrans(&fr);
 		else if (foremat && coef < 1.0-FTINY)
 			raytrans(&br);
+	}
 					/* mix perturbations */
 	for (i = 0; i < 3; i++)
 		r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
@@ -486,7 +489,7 @@ register CUBE  *scene;
 	}
 	cxset[0] = 0;
 	raymove(curpos, cxset, sflags, r, scene);
-	return(r->ro != NULL & r->ro != &Aftplane);
+	return((r->ro != NULL) & (r->ro != &Aftplane));
 }