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.25 by greg, Sun Apr 24 20:16:52 2011 UTC vs.
Revision 2.28 by greg, Thu Apr 28 00:24:43 2011 UTC

# Line 496 | Line 496 | SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
496          SDError         ec;
497          int             i;
498                                          /* check arguments */
499 <        if ((projSA == NULL) | (v1 == NULL))
499 >        if ((projSA == NULL) | (v1 == NULL) | (sd == NULL))
500                  return SDEargument;
501                                          /* initialize extrema */
502          switch (qflags) {
# Line 516 | Line 516 | SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
516                  rdf = sd->rf;
517          else
518                  rdf = sd->rb;
519 <        tdf = NULL;                     /* transmitted component? */
520 <        if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) {
521 <                rdf = NULL;
522 <                tdf = sd->tf;
523 <        }
519 >        tdf = sd->tf;
520 >        if (v2 != NULL)                 /* bidirectional? */
521 >                if (v1[2] > 0 ^ v2[2] > 0)
522 >                        rdf = NULL;
523 >                else
524 >                        tdf = NULL;
525          ec = SDEdata;                   /* run through components */
526          for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) {
527                  ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2,

Diff Legend

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