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

Comparing ray/src/rt/func.c (file contents):
Revision 2.17 by greg, Wed Apr 23 01:31:50 2003 UTC vs.
Revision 2.19 by schorsch, Mon Jul 21 22:30:19 2003 UTC

# Line 185 | Line 185 | register RAY  *r;
185                          funcxf.sca = r->rox->b.sca * f->b->sca;
186                          multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
187                  } else
188 <                        copystruct(&funcxf, &r->rox->b);
188 >                        funcxf = r->rox->b;
189          else
190 <                copystruct(&funcxf, f->b);
190 >                funcxf = *(f->b);
191          lastrno = r->rno;
192          eclock++;               /* notify expression evaluator */
193          return(1);
# Line 200 | Line 200 | char  *fname;
200   {
201          char  *ffname;
202  
203 <        if ((ffname = getpath(fname, getlibpath(), R_OK)) == NULL) {
203 >        if ((ffname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
204                  sprintf(errmsg, "cannot find function file \"%s\"", fname);
205                  error(USER, errmsg);
206          }

Diff Legend

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