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

Comparing ray/src/rt/m_brdf.c (file contents):
Revision 2.24 by greg, Wed Aug 22 21:21:51 2007 UTC vs.
Revision 2.25 by greg, Fri Sep 7 15:25:01 2007 UTC

# Line 168 | Line 168 | dirbrdf(               /* compute source contribution */
168                  dtmp = funvalue(sa[0], 5, vldx);
169                  setcolor(ctmp, dtmp, dtmp, dtmp);
170          }
171 <        if (errno == EDOM || errno == ERANGE) {
171 >        if ((errno == EDOM) | (errno == ERANGE)) {
172                  objerror(np->mp, WARNING, "compute error");
173                  return;
174          }
# Line 267 | Line 267 | m_brdf(                        /* color a ray that hit a BRDTfunc material
267          setcolor(ctmp, evalue(mf->ep[3]),
268                          evalue(mf->ep[4]),
269                          evalue(mf->ep[5]));
270 <        if (errno == EDOM || errno == ERANGE)
270 >        if ((errno == EDOM) | (errno == ERANGE))
271                  objerror(m, WARNING, "compute error");
272          else if (rayorigin(&sr, TRANS, r, ctmp) == 0) {
273                  if (!(r->crtype & SHADOW) && hastexture) {
# Line 296 | Line 296 | m_brdf(                        /* color a ray that hit a BRDTfunc material
296          setcolor(ctmp, evalue(mf->ep[0]),
297                          evalue(mf->ep[1]),
298                          evalue(mf->ep[2]));
299 <        if (errno == EDOM || errno == ERANGE)
299 >        if ((errno == EDOM) | (errno == ERANGE))
300                  objerror(m, WARNING, "compute error");
301          else if (rayorigin(&sr, REFLECTED, r, ctmp) == 0) {
302                  for (i = 0; i < 3; i++)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines