--- ray/src/rt/mx_data.c	1994/01/12 16:46:42	2.3
+++ ray/src/rt/mx_data.c	1998/08/10 18:35:14	2.4
@@ -1,7 +1,7 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static char SCCSid[] = "$SunId$ SGI";
 #endif
 
 /*
@@ -39,6 +39,7 @@ mx_data(m, r)			/* interpolate mixture data */
 register OBJREC  *m;
 RAY  *r;
 {
+	OBJECT	obj;
 	double  coef;
 	double  pt[MAXDIM];
 	DATARRAY  *dp;
@@ -48,10 +49,11 @@ RAY  *r;
 
 	if (m->oargs.nsargs < 6)
 		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);