ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/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.30 by greg, Thu Jun 9 17:09:39 2011 UTC

# Line 10 | Line 10 | static const char RCSid[] = "$Id$";
10   *
11   */
12  
13 + #define _USE_MATH_DEFINES
14   #include <stdio.h>
15   #include <stdlib.h>
16   #include <math.h>
# Line 168 | Line 169 | SDloadFile(SDData *sd, const char *fname)
169                  return lastErr;
170                                  /* try loading variable resolution data */
171          lastErr = SDloadTre(sd, wtl);
171 #if 0
172                                  /* check our result */
173 <        switch (lastErr) {
174 <        case SDEformat:
175 <        case SDEdata:
176 <        case SDEsupport:        /* possibly we just tried the wrong format */
173 >        if (lastErr == SDEsupport)      /* try matrix BSDF if not tree data */
174                  lastErr = SDloadMtx(sd, wtl);
175 <                break;
179 <        default:                /* variable res. OK else serious error */
180 <                break;
181 <        }
182 < #endif
175 >                
176                                  /* done with XML file */
177          ezxml_free(fl);
178          

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines