112 |
|
error(COMMAND, "not on image"); |
113 |
|
return(-1); |
114 |
|
} |
115 |
< |
if (!direc || ourview.type == VT_PAR) { |
115 |
> |
if (!direc | (ourview.type == VT_PAR)) { |
116 |
|
int weakhit = 0; |
117 |
|
FVECT weakpt; |
118 |
|
rayorigin(&thisray, PRIMARY, NULL, NULL); |
123 |
|
thisray.ro->omod)) |
124 |
|
m = findmaterial(thisray.ro); |
125 |
|
if ((m != NULL) & !weakhit && |
126 |
< |
istransp(m->otype) && |
126 |
> |
istransp(m) && |
127 |
|
m->otype != MAT_MIST) { |
128 |
|
weakhit = 1; |
129 |
|
VCOPY(weakpt, thisray.rop); |
130 |
< |
} else if (m != NULL && !istransp(m->otype) && |
130 |
> |
} else if (m != NULL && !istransp(m) && |
131 |
|
!isBSDFproxy(m)) |
132 |
|
break; /* something solid */ |
133 |
|
VCOPY(thisray.rorg, thisray.rop); |
361 |
|
{ |
362 |
|
int mx, my; |
363 |
|
|
364 |
< |
if (p->xmax - p->xmin <= 0 || p->ymax - p->ymin <= 0) |
364 |
> |
if ((p->xmax <= p->xmin) | (p->ymax <= p->ymin)) |
365 |
|
return; |
366 |
|
|
367 |
|
if (p->kid == NULL) { |