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.47 by greg, Thu Apr 14 17:34:49 2005 UTC vs.
Revision 2.48 by greg, Thu Apr 14 17:38:06 2005 UTC

# Line 738 | Line 738 | char  *s;
738                          strcpy(matspec, "back of ");
739                  if (mod != NULL) {
740                          strcat(matspec, mod->oname);
741 <                        if (mat != mod)
742 <                                sprintf(matspec+strlen(matspec), " (%s)",
743 <                                        mat!=NULL ? mat->oname : VOIDID);
741 >                        if (mat != mod && mat != NULL)
742 >                                sprintf(matspec+strlen(matspec),
743 >                                        " (%s)", mat->oname);
744                  } else
745                          strcat(matspec, VOIDID);
746                  sprintf(buf, "ray hit %s %s \"%s\"", matspec,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines