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

Comparing ray/src/common/bsdf_t.c (file contents):
Revision 3.41 by greg, Fri Apr 24 21:02:14 2015 UTC vs.
Revision 3.42 by greg, Sat Apr 25 19:08:29 2015 UTC

# Line 571 | Line 571 | SDqueryTre(const SDTre *sdt, float *coef,
571          yval = SDlookupTre(sdt->stc[tt_Y], gridPos, hc);
572          if (coef == NULL)               /* just getting hypercube? */
573                  return 1;
574 <        if ((sdt->stc[tt_u] == NULL) | (sdt->stc[tt_v] == NULL)) {
574 >        if (sdt->stc[tt_u] == NULL || sdt->stc[tt_v] == NULL) {
575                  *coef = yval;
576                  return 1;               /* no color */
577          }
# Line 1354 | Line 1354 | extract_diffuse(SDValue *dv, SDSpectralDF *df)
1354                  memcpy(df->comp[0].cspec, tt_RGB_prim, sizeof(tt_RGB_prim));
1355                  dv->cieY = subtract_min_RGB(&dv->spec, sdt->stc);
1356          } else {
1357 <                df->comp[0].cspec[0] = c_dfcolor;
1357 >                df->comp[0].cspec[0] = dv->spec = c_dfcolor;
1358                  dv->cieY = subtract_min_Y(sdt->stc[tt_Y]);
1359          }
1360          df->maxHemi -= dv->cieY;        /* adjust maximum hemispherical */

Diff Legend

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