--- ray/src/rt/mx_func.c	1991/11/25 09:50:56	2.2
+++ ray/src/rt/mx_func.c	2003/03/05 16:16:53	2.7
@@ -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: mx_func.c,v 2.7 2003/03/05 16:16:53 greg Exp $";
 #endif
-
 /*
  *  mx_func.c - routine for mixture functions.
- *
- *     11/2/88
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
 #include  "func.h"
@@ -33,6 +30,7 @@ mx_func(m, r)			/* compute mixture function */
 register OBJREC  *m;
 RAY  *r;
 {
+	OBJECT	obj;
 	register int  i;
 	double  coef;
 	OBJECT  mod[2];
@@ -40,10 +38,11 @@ RAY  *r;
 
 	if (m->oargs.nsargs < 4)
 		objerror(m, USER, "bad # arguments");
+	obj = objndx(m);
 	for (i = 0; i < 2; i++)
 		if (!strcmp(m->oargs.sarg[i], VOIDID))
 			mod[i] = OVOID;
-		else if ((mod[i] = modifier(m->oargs.sarg[i])) == OVOID) {
+		else if ((mod[i] = lastmod(obj, m->oargs.sarg[i])) == OVOID) {
 			sprintf(errmsg, "undefined modifier \"%s\"",
 					m->oargs.sarg[i]);
 			objerror(m, USER, errmsg);
@@ -52,9 +51,14 @@ RAY  *r;
 	setfunc(m, r);
 	errno = 0;
 	coef = evalue(mf->ep[0]);
-	if (errno) {
+	if (errno == EDOM || errno == ERANGE) {
 		objerror(m, WARNING, "compute error");
-		return;
+		return(0);
 	}
-	raymixture(r, mod[0], mod[1], coef);
+	if (raymixture(r, mod[0], mod[1], coef)) {
+		if (m->omod != OVOID)
+			objerror(m, USER, "inappropriate modifier");
+		return(1);
+	}
+	return(0);
 }