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

Comparing ray/src/rt/rv2.c (file contents):
Revision 2.36 by greg, Fri Mar 7 16:58:58 1997 UTC vs.
Revision 2.37 by greg, Tue Mar 18 18:09:15 1997 UTC

# Line 662 | Line 662 | char  *s;
662   {
663          char  buf[128];
664          int  x, y;
665 <        OBJREC  *inst;
665 >        OBJREC  *ino;
666          RAY  thisray;
667  
668          thisray.rmax = 0.0;
# Line 700 | Line 700 | char  *s;
700                                          objptr(thisray.ro->omod)->oname,
701                                  ofun[thisray.ro->otype].funame,
702                                  thisray.ro->oname);
703 <                if ((inst = objptr(thisray.robj)) != thisray.ro)
704 <                        sprintf(buf+strlen(buf), " in instance \"%s\"",
705 <                                        inst->oname);
703 >                if ((ino = objptr(thisray.robj)) != thisray.ro)
704 >                        sprintf(buf+strlen(buf), " in %s \"%s\"",
705 >                                        ofun[ino->otype].funame, ino->oname);
706                  (*dev->comout)(buf);
707                  (*dev->comin)(buf, NULL);
708                  if (thisray.rot >= FHUGE)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines