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.26 by greg, Sat Jan 25 18:27:39 2014 UTC vs.
Revision 2.27 by greg, Tue Feb 24 19:39:26 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"
17  
18   /*
19   *      Arguments to this material include optional diffuse colors.
# Line 468 | Line 469 | m_bsdf(OBJREC *m, RAY *r)
469                  raytrans(r);                    /* hide our proxy */
470                  return(1);
471          }
472 +        
473 +        /* PMAP: skip ambient ray if accounted for by photon map */
474 +        if (ambRayInPmap(r))
475 +           return(1);
476 +        
477                                                  /* get BSDF data */
478          nd.sd = loadBSDF(m->oargs.sarg[1]);
479                                                  /* diffuse reflectance */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines