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

Comparing ray/src/rt/initotypes.c (file contents):
Revision 2.23 by greg, Thu Nov 8 00:54:07 2018 UTC vs.
Revision 2.24 by greg, Sat Nov 10 15:37:20 2018 UTC

# Line 119 | Line 119 | findmaterial(OBJREC *o)
119                          if ((ao = findmaterial(objptr(aobj))) != NULL)
120                                  return(ao);
121                  }
122 +                                /* assume unmodified mixture is material */
123                  if (o->omod == OVOID)
124 <                        return(NULL);
124 >                        return(ismixture(o->otype) ? o : (OBJREC *)NULL);
125                  o = objptr(o->omod);
126          }
127          return(o);              /* XXX: material mixtures will return NULL */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines