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

Comparing ray/src/rt/m_bsdf.c (file contents):
Revision 2.27 by greg, Tue Feb 24 19:39:26 2015 UTC vs.
Revision 2.29 by greg, Sat Aug 1 23:27:04 2015 UTC

# Line 13 | Line 13 | static const char RCSid[] = "$Id$";
13   #include  "func.h"
14   #include  "bsdf.h"
15   #include  "random.h"
16 #include  "pmapmat.h"
16  
17   /*
18   *      Arguments to this material include optional diffuse colors.
# Line 465 | Line 464 | m_bsdf(OBJREC *m, RAY *r)
464          }
465                                                  /* check other rays to pass */
466          if (nd.thick != 0 && (!(r->crtype & (SPECULAR|AMBIENT)) ||
467 <                                nd.thick > 0 ^ hitfront)) {
467 >                                (nd.thick > 0) ^ hitfront)) {
468                  raytrans(r);                    /* hide our proxy */
469                  return(1);
470          }
472        
473        /* PMAP: skip ambient ray if accounted for by photon map */
474        if (ambRayInPmap(r))
475           return(1);
476        
471                                                  /* get BSDF data */
472          nd.sd = loadBSDF(m->oargs.sarg[1]);
473                                                  /* diffuse reflectance */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines