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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.95 by rschregle, Tue May 19 13:52:37 2015 UTC vs.
Revision 2.97 by greg, Fri Aug 21 18:21:05 2015 UTC

# Line 196 | Line 196 | setambient(void)                               /* initialize calculation */
196                  sprintf(errmsg, "cannot open ambient file \"%s\"", ambfile);
197                  error(SYSTEM, errmsg);
198          }
199 < #ifdef getc_unlocked
199 > #if 0
200          flockfile(ambfp);                       /* application-level lock */
201   #endif
202   #ifdef  F_SETLKW
# Line 671 | Line 671 | multambient(           /* compute ambient component & multiply
671                  return;
672  
673          /* PMAP: Otherwise factor in ambient from caustic photon map
674 <         * (ambCausticPmap() returns zero if caustic photons disabled) and
674 >         * (ambPmapCaustic() returns zero if caustic photons disabled) and
675           * continue with RADIANCE ambient calculation */
676          copycolor(caustic, aval);
677          ambPmapCaustic(caustic, r, rdepth);

Diff Legend

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