305 |
|
error(COMMAND, "not on image"); |
306 |
|
return; |
307 |
|
} |
308 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
308 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
309 |
|
if (!localhit(&thisray, &thescene)) { |
310 |
|
error(COMMAND, "not a local object"); |
311 |
|
return; |
719 |
|
return; |
720 |
|
} |
721 |
|
|
722 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
722 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
723 |
|
|
724 |
|
rayvalue(&thisray); |
725 |
|
|
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, |