--- ray/src/rt/initotypes.c	2004/09/10 17:08:36	2.13
+++ ray/src/rt/initotypes.c	2012/07/29 19:01:39	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: initotypes.c,v 2.13 2004/09/10 17:08:36 greg Exp $";
+static const char RCSid[] = "$Id: initotypes.c,v 2.18 2012/07/29 19:01:39 greg Exp $";
 #endif
 /*
  * Initialize ofun[] list for renderers
@@ -7,7 +7,7 @@ static const char RCSid[] = "$Id: initotypes.c,v 2.13 
 
 #include  "copyright.h"
 
-#include  "standard.h"
+#include  "ray.h"
 #include  "otypes.h"
 #include  "rtotypes.h"
 #include  "otspecial.h"
@@ -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 =
@@ -90,7 +93,8 @@ initotypes(void)			/* initialize ofun array */
 extern int
 o_default(OBJREC *o, RAY *r)			/* default action is error */
 {
-	error(CONSISTENCY, "unexpected object call");
-				/* call to pull in freeobjmem.o */ /* XXX ? */
+	objerror(o, CONSISTENCY, "unexpected object call");
+				/* unused call to load freeobjmem.o */
 	free_objs(0, 0);
+	return(0);
 }