--- ray/src/rt/initotypes.c	2005/06/23 11:51:47	2.15
+++ ray/src/rt/initotypes.c	2014/07/08 18:25:00	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: initotypes.c,v 2.15 2005/06/23 11:51:47 greg Exp $";
+static const char RCSid[] = "$Id: initotypes.c,v 2.19 2014/07/08 18:25:00 greg Exp $";
 #endif
 /*
  * Initialize ofun[] list for renderers
@@ -16,7 +16,7 @@ static const char RCSid[] = "$Id: initotypes.c,v 2.15 
 FUN  ofun[NUMOTYPE] = INIT_OTYPE;
 
 
-extern void
+void
 initotypes(void)			/* initialize ofun array */
 {
 	ofun[OBJ_SPHERE].funp =
@@ -48,6 +48,8 @@ initotypes(void)			/* initialize ofun array */
 	ofun[MAT_PLASTIC2].flags |= T_OPAQUE;
 	ofun[MAT_METAL2].flags |= T_OPAQUE;
 	ofun[MAT_TRANS2].flags |= T_IRR_IGN;
+	ofun[MAT_ASHIKHMIN].funp = m_ashikhmin;
+	ofun[MAT_ASHIKHMIN].flags |= T_OPAQUE;
 	ofun[MAT_DIELECTRIC].funp =
 	ofun[MAT_INTERFACE].funp = m_dielectric;
 	ofun[MAT_DIELECTRIC].flags |= T_IRR_IGN;
@@ -61,6 +63,7 @@ initotypes(void)			/* initialize ofun array */
 	ofun[MAT_DIRECT2].funp = m_direct;
 	ofun[MAT_CLIP].funp = m_clip;
 	ofun[MAT_BRTDF].funp = m_brdf;
+	ofun[MAT_BSDF].funp = m_bsdf;
 	ofun[MAT_PFUNC].funp =
 	ofun[MAT_MFUNC].funp =
 	ofun[MAT_PDATA].funp =
@@ -87,10 +90,11 @@ initotypes(void)			/* initialize ofun array */
 }
 
 
-extern int
+int
 o_default(OBJREC *o, RAY *r)			/* default action is error */
 {
 	objerror(o, CONSISTENCY, "unexpected object call");
-				/* call to pull in freeobjmem.o */ /* XXX ? */
+				/* unused call to load freeobjmem.o */
 	free_objs(0, 0);
+	return(0);
 }