--- ray/src/rt/freeobjmem.c	2003/02/22 02:07:28	2.4
+++ ray/src/rt/freeobjmem.c	2023/11/15 18:02:52	2.10
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: freeobjmem.c,v 2.4 2003/02/22 02:07:28 greg Exp $";
+static const char	RCSid[] = "$Id: freeobjmem.c,v 2.10 2023/11/15 18:02:52 greg Exp $";
 #endif
 /*
  * Free memory associated with object(s)
@@ -7,75 +7,25 @@ static const char	RCSid[] = "$Id: freeobjmem.c,v 2.4 2
  * External symbols declared in ray.h
  */
 
-/* ====================================================================
- * 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 "ray.h"
 #include "otypes.h"
+#include "rtotypes.h"
+#include "bsdf.h"
 #include "face.h"
 #include "cone.h"
 #include "instance.h"
 #include "data.h"
 #include "font.h"
+#include "func.h"
+#include "mesh.h"
 
 
 int
-free_os(op)			/* free unneeded memory for object */
-register OBJREC	*op;
+free_os(			/* free unneeded memory for object */
+	OBJREC	*op
+)
 {
 	if (op->os == NULL)
 		return(0);
@@ -97,6 +47,9 @@ register OBJREC	*op;
 	case OBJ_INSTANCE:	/* octree instance */
 		freeinstance(op);
 		return(1);
+	case OBJ_MESH:		/* mesh instance */
+		freemeshinst(op);
+		return(1);
 	case PAT_BTEXT:		/* monochromatic text */
 	case PAT_CTEXT:		/* colored text */
 	case MIX_TEXT:		/* mixing text */
@@ -104,6 +57,8 @@ register OBJREC	*op;
 		return(1);
 	case MAT_CLIP:		/* clipping surface */
 	case MAT_SPOT:		/* spot light source */
+	case PAT_SPECTRUM:	/* constant spectrum */
+	case PAT_SPECFILE:	/* spectrum from data file */
 		free((void *)op->os);
 		op->os = NULL;
 		return(1);
@@ -116,12 +71,13 @@ register OBJREC	*op;
 
 
 int
-free_objs(on, no)		/* free some object structures */
-register OBJECT	on;
-OBJECT	no;
+free_objs(		/* free some object structures */
+	OBJECT	on,
+	OBJECT	no
+)
 {
 	int	nfreed;
-	register OBJREC	*op;
+	OBJREC	*op;
 
 	for (nfreed = 0; no-- > 0; on++) {
 		op = objptr(on);
@@ -133,9 +89,10 @@ OBJECT	no;
 
 
 void
-free_objmem()			/* free all object cache memory */
+free_objmem(void)			/* free all object cache memory */
 {
 	free_objs(0, nobjects);
 	freedata(NULL);
 	freefont(NULL);
+	SDfreeCache(NULL);
 }