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

Comparing ray/src/rt/t_data.c (file contents):
Revision 2.9 by greg, Mon Oct 25 22:57:45 2010 UTC vs.
Revision 2.10 by greg, Sat Jun 9 07:16:47 2012 UTC

# Line 67 | Line 67 | t_data(                        /* interpolate texture data */
67                  disp[i] = funvalue(m->oargs.sarg[i], 3, dval);
68          if (errno == EDOM || errno == ERANGE)
69                  goto computerr;
70 <        if (mf->f != &unitxf)
71 <                multv3(disp, disp, mf->f->xfm);
70 >        if (mf->fxp != &unitxf)
71 >                multv3(disp, disp, mf->fxp->xfm);
72          if (r->rox != NULL) {
73                  multv3(disp, disp, r->rox->f.xfm);
74 <                d = 1.0 / (mf->f->sca * r->rox->f.sca);
74 >                d = 1.0 / (mf->fxp->sca * r->rox->f.sca);
75          } else
76 <                d = 1.0 / mf->f->sca;
76 >                d = 1.0 / mf->fxp->sca;
77          VSUM(r->pert, r->pert, disp, d);
78          return(0);
79   computerr:

Diff Legend

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