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

Comparing ray/src/rt/m_mirror.c (file contents):
Revision 2.13 by greg, Sun Sep 26 15:51:15 2010 UTC vs.
Revision 2.15 by greg, Sat Jan 25 18:27:39 2014 UTC

# Line 43 | Line 43 | m_mirror(                      /* shade mirrored ray */
43          if (m->oargs.nfargs != 3 || m->oargs.nsargs > 1)
44                  objerror(m, USER, "bad number of arguments");
45                                          /* check for substitute material */
46 <        if (m->oargs.nsargs > 0 &&
46 >                                        /* but avoid double-counting */
47 >        if (m->oargs.nsargs > 0 && !(r->crtype & (AMBIENT|SPECULAR)) &&
48                          (r->rsrc < 0 || source[r->rsrc].so != r->ro)) {
49                  if (!strcmp(m->oargs.sarg[0], VOIDID)) {
50                          raytrans(r);
# Line 55 | Line 56 | m_mirror(                      /* shade mirrored ray */
56          if (r->rsrc >= 0 && source[r->rsrc].so != r->ro)
57                  return(1);
58  
59 <        if (r->rod < 0.)                /* back is black */
59 >        if (r->rod < 0.) {              /* back is black */
60 >                if (!backvis)
61 >                        raytrans(r);    /* unless back visibility is off */
62                  return(1);
63 +        }
64                                          /* get modifiers */
65          raytexture(r, m->omod);
66                                          /* assign material color */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines