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

Comparing ray/src/cv/bsdf2klems.c (file contents):
Revision 2.22 by schorsch, Sun Mar 6 01:13:17 2016 UTC vs.
Revision 2.23 by greg, Thu Oct 13 16:59:29 2016 UTC

# Line 41 | Line 41 | static int             do_prog = 79;
41   static char             *wrapBSDF[MAXCARG] = {"wrapBSDF", "-W", "-UU"};
42   static int              wbsdfac = 3;
43  
44 < /* Add argument to wrapBSDF, allocating space if isstatic */
44 > /* Add argument to wrapBSDF, allocating space if !isstatic */
45   static void
46   add_wbsdf(const char *arg, int isstatic)
47   {
# Line 470 | Line 470 | eval_rbf(void)
470  
471                      eval_rbfcol(&sdv, rbf, vout);
472                      sum += sdv.cieY;
473 <                    if (XZarr != NULL) {
473 >                    if (rbf_colorimetry == RBCtristimulus) {
474                          c_ccvt(&sdv.spec, C_CSXY);
475                          xsum += sdv.cieY * sdv.spec.cx;
476                          ysum += sdv.cieY * sdv.spec.cy;
# Line 478 | Line 478 | eval_rbf(void)
478                  }
479                  n = j*abp->nangles + i;
480                  bsdfarr[n] = sum / npsamps;
481 <                if (XZarr != NULL) {
481 >                if (rbf_colorimetry == RBCtristimulus) {
482                      XZarr[n][0] = xsum*sum/(npsamps*ysum);
483                      XZarr[n][1] = (sum - xsum - ysum)*sum/(npsamps*ysum);
484                  }

Diff Legend

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