ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/source.c

Comparing ray/src/rt/source.c (file contents):
Revision 2.47 by greg, Thu Mar 10 22:37:00 2005 UTC vs.
Revision 2.48 by greg, Thu Apr 14 17:43:43 2005 UTC

#	Line 46 | Line 46 | extern OBJREC *                        /* find an object's actual material
46		findmaterial(register OBJREC *o)
47		{
48		while (!ismaterial(o->otype)) {
49	–	if (ismixture(o->otype))
50	–	return(NULL);   /* reject mixed materials */
49		if (o->otype == MOD_ALIAS && o->oargs.nsargs) {
50		OBJECT  aobj;
51		OBJREC  *ao;
#	Line 62 | Line 60 | findmaterial(register OBJREC *o)
60		return(NULL);
61		o = objptr(o->omod);
62		}
63	<	return(o);
63	>	return(o);              /* mixtures will return NULL */
64		}
65
66

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)