--- ray/src/common/mesh.c	2003/07/17 09:21:29	2.12
+++ ray/src/common/mesh.c	2004/03/28 20:33:12	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: mesh.c,v 2.12 2003/07/17 09:21:29 schorsch Exp $";
+static const char RCSid[] = "$Id: mesh.c,v 2.19 2004/03/28 20:33:12 schorsch Exp $";
 #endif
 /*
  * Mesh support routines
@@ -7,7 +7,10 @@ static const char RCSid[] = "$Id: mesh.c,v 2.12 2003/0
 
 #include <string.h>
 
-#include "standard.h"
+#include "rtio.h"
+#include "rtmath.h"
+#include "rterror.h"
+#include "paths.h"
 #include "octree.h"
 #include "object.h"
 #include "otypes.h"
@@ -27,11 +30,16 @@ typedef struct {
 
 static MESH	*mlist = NULL;		/* list of loaded meshes */
 
+static lut_keycmpf_t cvcmp;
+static lut_hashf_t cvhash;
 
+
 static unsigned long
-cvhash(cvp)				/* hash an encoded vertex */
-MCVERT	*cvp;
+cvhash(p)				/* hash an encoded vertex */
+//MCVERT	*cvp;
+void	*p;
 {
+	MCVERT	*cvp = p;
 	unsigned long	hval;
 	
 	if (!(cvp->fl & MT_V))
@@ -46,9 +54,11 @@ MCVERT	*cvp;
 
 
 static int
-cvcmp(v1, v2)				/* compare encoded vertices */
-register MCVERT	*v1, *v2;
+cvcmp(vv1, vv2)				/* compare encoded vertices */
+//register MCVERT	*v1, *v2;
+const void	*vv1, *vv2;
 {
+	const MCVERT	*v1 = vv1, *v2 = vv2;
 	if (v1->fl != v2->fl)
 		return(1);
 	if (v1->xyz[0] != v2->xyz[0])
@@ -306,7 +316,7 @@ MESHVERT	*vp;
 				(vp->v[i] - mp->mcube.cuorg[i]) /
 				mp->mcube.cusize);
 	}
-	if (vp->fl & MT_N)
+	if (vp->fl & MT_N)		/* assumes normalized! */
 		cv.norm = encodedir(vp->n);
 	if (vp->fl & MT_UV)
 		for (i = 0; i < 2; i++) {
@@ -410,11 +420,12 @@ OBJECT		mo;
 		pn[i] = vid[i] >> 8;
 	}
 				/* normalize material index */
-	if (mo != OVOID)
+	if (mo != OVOID) {
 		if ((mo -= mp->mat0) >= mp->nmats)
 			mp->nmats = mo+1;
 		else if (mo < 0)
 			error(INTERNAL, "modifier range error in addmeshtri");
+	}
 				/* assign triangle */
 	if (pn[0] == pn[1] && pn[1] == pn[2]) {	/* local case */
 		pp = &mp->patch[pn[0]];
@@ -542,8 +553,6 @@ register MESH	*mp;
 				if (nouvbounds && pp->uv != NULL)
 					return("unreferenced uv coordinates");
 			}
-			if (pp->ntris + pp->nj1tris + pp->nj2tris <= 0)
-				error(WARNING, "no triangles in patch");
 			if (pp->ntris > 0 && pp->tri == NULL)
 				return("missing patch triangle list");
 			if (pp->nj1tris > 0 && pp->j1tri == NULL)