--- ray/src/ot/bbox.c	2003/02/22 02:07:26	2.2
+++ ray/src/ot/bbox.c	2003/03/11 17:08:55	2.4
@@ -1,66 +1,11 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: bbox.c,v 2.2 2003/02/22 02:07:26 greg Exp $";
+static const char RCSid[] = "$Id: bbox.c,v 2.4 2003/03/11 17:08:55 greg Exp $";
 #endif
 /*
  *  bbox.c - routines for bounding box computation.
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * 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  "copyright.h"
 
 #include  "standard.h"
 
@@ -76,7 +21,9 @@ static const char	RCSid[] = "$Id: bbox.c,v 2.2 2003/02
 
 #include  "instance.h"
 
+#include  "mesh.h"
 
+
 add2bbox(o, bbmin, bbmax)		/* expand bounding box to fit object */
 register OBJREC  *o;
 FVECT  bbmin, bbmax;
@@ -84,6 +31,7 @@ FVECT  bbmin, bbmax;
 	CONE  *co;
 	FACE  *fo;
 	INSTANCE  *io;
+	MESHINST  *mi;
 	FVECT  v;
 	register int  i, j;
 
@@ -125,6 +73,18 @@ FVECT  bbmin, bbmax;
 					v[i] += io->obj->scube.cusize;
 			}
 			multp3(v, v, io->x.f.xfm);
+			point2bbox(v, bbmin, bbmax);
+		}
+		break;
+	case OBJ_MESH:
+		mi = getmeshinst(o, IO_BOUNDS);
+		for (j = 0; j < 8; j++) {
+			for (i = 0; i < 3; i++) {
+				v[i] = mi->msh->mcube.cuorg[i];
+				if (j & 1<<i)
+					v[i] += mi->msh->mcube.cusize;
+			}
+			multp3(v, v, mi->x.f.xfm);
 			point2bbox(v, bbmin, bbmax);
 		}
 		break;