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

Comparing ray/src/rt/rv2.c (file contents):
Revision 2.45 by greg, Fri Jan 21 00:52:59 2005 UTC vs.
Revision 2.46 by greg, Thu Apr 14 04:42:33 2005 UTC

# Line 14 | Line 14 | static const char      RCSid[] = "$Id$";
14  
15   #include  "platform.h"
16   #include  "ray.h"
17 + #include  "source.h"
18   #include  "ambient.h"
19   #include  "otypes.h"
20   #include  "rpaint.h"
# Line 725 | Line 726 | char  *s;
726          if (thisray.ro == NULL)
727                  (*dev->comout)("ray hit nothing");
728          else {
729 +                OBJREC  *mat = findmaterial(thisray.ro);
730                  sprintf(buf, "ray hit %s%s %s \"%s\"",
731                                  thisray.rod < 0.0 ? "back of " : "",
732 <                                thisray.ro->omod == OVOID ? VOIDID :
731 <                                        objptr(thisray.ro->omod)->oname,
732 >                                mat==NULL ? VOIDID : mat->oname,
733                                  ofun[thisray.ro->otype].funame,
734                                  thisray.ro->oname);
735                  if ((ino = objptr(thisray.robj)) != thisray.ro)

Diff Legend

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