--- ray/src/rt/freeobjmem.c	1993/02/10 12:51:40	2.2
+++ ray/src/rt/freeobjmem.c	2003/07/10 03:47:00	2.6
@@ -1,16 +1,21 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: freeobjmem.c,v 2.6 2003/07/10 03:47:00 greg Exp $";
 #endif
-
 /*
  * Free memory associated with object(s)
+ *
+ * External symbols declared in ray.h
  */
 
-#include "standard.h"
-#include "object.h"
+#include "copyright.h"
+
+#include "ray.h"
 #include "otypes.h"
+#include "face.h"
+#include "cone.h"
+#include "instance.h"
+#include "data.h"
+#include "font.h"
 
 
 int
@@ -37,23 +42,24 @@ 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 */
 		freetext(op);
 		return(1);
 	case MAT_CLIP:		/* clipping surface */
-		free(op->os);
+	case MAT_SPOT:		/* spot light source */
+		free((void *)op->os);
 		op->os = NULL;
 		return(1);
-	case MAT_SPOT:		/* spot light source */
-		return(0);
-	default:
+	}
 #ifdef DEBUG
-		objerror(op, WARNING, "cannot free structure");
+	objerror(op, WARNING, "cannot free structure");
 #endif
-		return(0);
-	}
+	return(0);
 }
 
 
@@ -74,10 +80,10 @@ OBJECT	no;
 }
 
 
+void
 free_objmem()			/* free all object cache memory */
 {
 	free_objs(0, nobjects);
 	freedata(NULL);
-	freepict(NULL);
 	freefont(NULL);
 }