--- ray/src/rt/m_clip.c	1991/11/12 17:08:41	2.1
+++ ray/src/rt/m_clip.c	2003/02/22 02:07:28	2.5
@@ -1,13 +1,65 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: m_clip.c,v 2.5 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  m_clip.c - routine for clipped (cut) objects.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     3/17/86
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
  */
 
 #include  "ray.h"
@@ -21,17 +73,18 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 
+int
 m_clip(m, r)			/* clip objects from ray */
 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 +94,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);
@@ -89,9 +142,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);
 }