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); |
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 |
|
} |