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

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.27 by greg, Wed Apr 27 23:05:51 2011 UTC vs.
Revision 2.29 by greg, Fri Jun 3 18:12:58 2011 UTC

# Line 168 | Line 168 | SDloadFile(SDData *sd, const char *fname)
168                  return lastErr;
169                                  /* try loading variable resolution data */
170          lastErr = SDloadTre(sd, wtl);
171 – #if 0
171                                  /* check our result */
172 <        switch (lastErr) {
174 <        case SDEformat:
175 <        case SDEdata:
176 <        case SDEsupport:        /* possibly we just tried the wrong format */
172 >        if (lastErr == SDEsupport)      /* try matrix BSDF if not tree data */
173                  lastErr = SDloadMtx(sd, wtl);
174 <                break;
179 <        default:                /* variable res. OK else serious error */
180 <                break;
181 <        }
182 < #endif
174 >                
175                                  /* done with XML file */
176          ezxml_free(fl);
177          

Diff Legend

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