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

Comparing ray/src/rt/preload.c (file contents):
Revision 2.13 by greg, Fri Nov 8 17:11:42 2013 UTC vs.
Revision 2.16 by greg, Tue Jun 26 14:42:18 2018 UTC

# Line 28 | Line 28 | load_os(                       /* load associated data for object */
28          OBJREC  *op
29   )
30   {
31 <        DATARRAY  *dp;
31 >        DATARRAY        *dp;
32 >        SDData          *sd;
33  
34 +        SDretainSet = SDretainAll;
35 +
36          switch (op->otype) {
37          case OBJ_FACE:          /* polygon */
38                  getface(op);
# Line 104 | Line 107 | load_os(                       /* load associated data for object */
107                  if (op->oargs.nsargs < 6)
108                          goto sargerr;
109                  getfunc(op, 5, 0x1d, 1);
110 <                loadBSDF(op->oargs.sarg[1]);
110 >                sd = loadBSDF(op->oargs.sarg[1]);
111 >                if (sd != NULL) SDfreeCache(sd);
112 >                return(1);
113 >        case MAT_ABSDF:         /* aBSDF material */
114 >                if (op->oargs.nsargs < 5)
115 >                        goto sargerr;
116 >                getfunc(op, 4, 0xe, 1);
117 >                sd = loadBSDF(op->oargs.sarg[0]);
118 >                if (sd != NULL) SDfreeCache(sd);
119                  return(1);
120          case MAT_PDATA:         /* plastic BRDF data */
121          case MAT_MDATA:         /* metal BRDF data */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)