--- ray/src/rt/freeobjmem.c	2003/02/25 02:47:22	2.5
+++ ray/src/rt/freeobjmem.c	2011/02/18 00:40:25	2.8
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: freeobjmem.c,v 2.5 2003/02/25 02:47:22 greg Exp $";
+static const char	RCSid[] = "$Id: freeobjmem.c,v 2.8 2011/02/18 00:40:25 greg Exp $";
 #endif
 /*
  * Free memory associated with object(s)
@@ -11,16 +11,21 @@ static const char	RCSid[] = "$Id: freeobjmem.c,v 2.5 2
 
 #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;
+extern int
+free_os(			/* free unneeded memory for object */
+	register OBJREC	*op
+)
 {
 	if (op->os == NULL)
 		return(0);
@@ -42,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 */
@@ -60,10 +68,11 @@ register OBJREC	*op;
 }
 
 
-int
-free_objs(on, no)		/* free some object structures */
-register OBJECT	on;
-OBJECT	no;
+extern int
+free_objs(		/* free some object structures */
+	register OBJECT	on,
+	OBJECT	no
+)
 {
 	int	nfreed;
 	register OBJREC	*op;
@@ -77,10 +86,11 @@ OBJECT	no;
 }
 
 
-void
-free_objmem()			/* free all object cache memory */
+extern void
+free_objmem(void)			/* free all object cache memory */
 {
 	free_objs(0, nobjects);
 	freedata(NULL);
 	freefont(NULL);
+	SDfreeCache(NULL);
 }