--- ray/src/rt/preload.c	2011/02/18 00:40:25	2.10
+++ ray/src/rt/preload.c	2011/02/18 02:41:55	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: preload.c,v 2.10 2011/02/18 00:40:25 greg Exp $";
+static const char	RCSid[] = "$Id: preload.c,v 2.11 2011/02/18 02:41:55 greg Exp $";
 #endif
 /*
  * Preload associated object structures to maximize memory sharing.
@@ -18,7 +18,6 @@ static const char	RCSid[] = "$Id: preload.c,v 2.10 201
 #include "data.h"
 #include "func.h"
 #include "bsdf.h"
-#include "paths.h"
 
 
 /* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
@@ -106,10 +105,7 @@ load_os(			/* load associated data for object */
 		if (op->oargs.nsargs < 6)
 			goto sargerr;
 		getfunc(op, 5, 0x1d, 1);
-		sd = SDgetCache(op->oargs.sarg[1]);
-		if (sd != NULL && !SDisLoaded(sd))
-			SDloadFile(sd, getpath(op->oargs.sarg[1],
-						getrlibpath(), R_OK));
+		loadBSDF(op->oargs.sarg[1]);
 		return(1);
 	case MAT_PDATA:		/* plastic BRDF data */
 	case MAT_MDATA:		/* metal BRDF data */