ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/preload.c
(Generate patch)

Comparing ray/src/rt/preload.c (file contents):
Revision 2.10 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 2.12 by greg, Tue Aug 16 18:09:53 2011 UTC

# Line 18 | Line 18 | static const char      RCSid[] = "$Id$";
18   #include "data.h"
19   #include "func.h"
20   #include "bsdf.h"
21 – #include "paths.h"
21  
22  
23   /* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
# Line 30 | Line 29 | load_os(                       /* load associated data for object */
29   )
30   {
31          DATARRAY  *dp;
33 –        SDData  *sd;
32  
33          switch (op->otype) {
34          case OBJ_FACE:          /* polygon */
# Line 106 | Line 104 | load_os(                       /* load associated data for object */
104                  if (op->oargs.nsargs < 6)
105                          goto sargerr;
106                  getfunc(op, 5, 0x1d, 1);
107 <                sd = SDgetCache(op->oargs.sarg[1]);
110 <                if (sd != NULL && !SDisLoaded(sd))
111 <                        SDloadFile(sd, getpath(op->oargs.sarg[1],
112 <                                                getrlibpath(), R_OK));
107 >                loadBSDF(op->oargs.sarg[1]);
108                  return(1);
109          case MAT_PDATA:         /* plastic BRDF data */
110          case MAT_MDATA:         /* metal BRDF data */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines