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.31 by greg, Fri Jun 10 01:11:26 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 <string.h>
17   #include <math.h>
18   #include "ezxml.h"
19   #include "hilbert.h"
# Line 168 | Line 170 | SDloadFile(SDData *sd, const char *fname)
170                  return lastErr;
171                                  /* try loading variable resolution data */
172          lastErr = SDloadTre(sd, wtl);
171 – #if 0
173                                  /* check our result */
174 <        switch (lastErr) {
174 <        case SDEformat:
175 <        case SDEdata:
176 <        case SDEsupport:        /* possibly we just tried the wrong format */
174 >        if (lastErr == SDEsupport)      /* try matrix BSDF if not tree data */
175                  lastErr = SDloadMtx(sd, wtl);
176 <                break;
179 <        default:                /* variable res. OK else serious error */
180 <                break;
181 <        }
182 < #endif
176 >                
177                                  /* done with XML file */
178          ezxml_free(fl);
179          

Diff Legend

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