--- ray/src/rt/m_clip.c	1989/02/02 10:41:26	1.1
+++ ray/src/rt/m_clip.c	1998/08/10 18:38:56	2.4
@@ -1,7 +1,7 @@
-/* Copyright (c) 1986 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
 
 /*
@@ -26,12 +26,12 @@ register OBJREC  *m;
 register RAY  *r;
 {
 	OBJECT  cset[MAXSET+1], *modset;
+	OBJECT  obj, mod;
 	int  entering;
 	register int  i;
 
+	obj = objndx(m);
 	if ((modset = (OBJECT *)m->os) == NULL) {
-		register OBJECT  mod;
-
 		if (m->oargs.nsargs < 1 || m->oargs.nsargs > MAXSET)
 			objerror(m, USER, "bad # arguments");
 		modset = (OBJECT *)malloc((m->oargs.nsargs+1)*sizeof(OBJECT));
@@ -41,7 +41,7 @@ register RAY  *r;
 		for (i = 0; i < m->oargs.nsargs; i++) {
 			if (!strcmp(m->oargs.sarg[i], VOIDID))
 				continue;
-			if ((mod = modifier(m->oargs.sarg[i])) == OVOID) {
+			if ((mod = lastmod(obj, m->oargs.sarg[i])) == OVOID) {
 				sprintf(errmsg, "unknown modifier \"%s\"",
 						m->oargs.sarg[i]);
 				objerror(m, WARNING, errmsg);
@@ -53,7 +53,7 @@ register RAY  *r;
 			}
 			insertelem(modset, mod);
 		}
-		(OBJECT *)m->os = modset;
+		m->os = (char *)modset;
 	}
 	if (r->clipset != NULL)
 		setcopy(cset, r->clipset);
@@ -89,9 +89,9 @@ register RAY  *r;
 					inside--;
 		if (inside > 0) {	/* we just hit the object */
 			flipsurface(r);
-			rayshade(r, modifier(m->oargs.sarg[0]));
-			return;
+			return(rayshade(r, lastmod(obj, m->oargs.sarg[0])));
 		}
 	}
 	raytrans(r);			/* else transfer ray */
+	return(1);
 }