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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.19 by greg, Thu Jan 26 15:34:55 1995 UTC vs.
Revision 2.20 by greg, Fri Sep 29 10:46:12 1995 UTC

# Line 195 | Line 195 | int  mod;
195                          error(USER, errmsg);
196                  }
197                  ******/
198 <                if ((*ofun[m->otype].funp)(m, r))
199 <                        objerror(r->ro, USER, "conflicting materials");
198 >                if ((*ofun[m->otype].funp)(m, r)) {
199 >                        sprintf(errmsg, "conflicting material \"%s\"",
200 >                                        m->oname);
201 >                        objerror(r->ro, USER, errmsg);
202 >                }
203          }
204          depth--;                        /* end here */
205   }

Diff Legend

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