--- ray/src/common/bsdf_m.c	2015/08/27 04:33:31	3.35
+++ ray/src/common/bsdf_m.c	2018/05/10 22:55:35	3.38
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: bsdf_m.c,v 3.35 2015/08/27 04:33:31 greg Exp $";
+static const char RCSid[] = "$Id: bsdf_m.c,v 3.38 2018/05/10 22:55:35 greg Exp $";
 #endif
 /*
  *  bsdf_m.c
@@ -191,6 +191,7 @@ fo_getndx(const FVECT v, void *p)
 double
 io_getohm(int ndx, void *p)
 {
+	static void	*last_p = NULL;
 	static int	last_li = -1;
 	static double	last_ohm;
 	ANGLE_BASIS	*ab = (ANGLE_BASIS *)p;
@@ -201,8 +202,9 @@ io_getohm(int ndx, void *p)
 		return -1.;
 	for (li = 0; ndx >= ab->lat[li].nphis; li++)
 		ndx -= ab->lat[li].nphis;
-	if (li == last_li)			/* cached latitude? */
+	if ((p == last_p) & (li == last_li))		/* cached latitude? */
 		return last_ohm;
+	last_p = p;
 	last_li = li;
 	theta = M_PI/180. * ab->lat[li].tmin;
 	theta1 = M_PI/180. * ab->lat[li+1].tmin;
@@ -647,8 +649,8 @@ extract_diffuse(SDValue *dv, SDSpectralDF *df)
 					/* subtract minimum value */
 	dv->cieY = subtract_min(&dv->spec, (SDMat *)df->comp[0].dist);
 	df->maxHemi -= dv->cieY;	/* adjust maximum hemispherical */
-					/* make sure everything is set */
-	c_ccvt(&dv->spec, C_CSXY+C_CSSPEC);
+				
+	c_ccvt(&dv->spec, C_CSXY);	/* make sure (x,y) is set */
 	return df;
 }
 
@@ -906,7 +908,7 @@ SDsampMtxCDist(FVECT ioVec, double randX, const SDCDst
 }
 
 /* Fixed resolution BSDF methods */
-SDFunc			SDhandleMtx = {
+const SDFunc		SDhandleMtx = {
 				&SDgetMtxBSDF,
 				&SDqueryMtxProjSA,
 				&SDgetMtxCDist,