--- ray/src/common/mesh.c	2003/07/10 03:30:11	2.10
+++ ray/src/common/mesh.c	2004/03/16 19:56:27	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: mesh.c,v 2.10 2003/07/10 03:30:11 greg Exp $";
+static const char RCSid[] = "$Id: mesh.c,v 2.18 2004/03/16 19:56:27 greg Exp $";
 #endif
 /*
  * Mesh support routines
@@ -7,7 +7,10 @@ static const char RCSid[] = "$Id: mesh.c,v 2.10 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"
@@ -79,13 +82,16 @@ int	flags;
 
 	flags &= IO_LEGAL;
 	for (ms = mlist; ms != NULL; ms = ms->next)
-		if (!strcmp(mname, ms->name))
+		if (!strcmp(mname, ms->name)) {
+			ms->nref++;	/* increase reference count */
 			break;
+		}
 	if (ms == NULL) {		/* load first time */
 		ms = (MESH *)calloc(1, sizeof(MESH));
 		if (ms == NULL)
 			error(SYSTEM, "out of memory in getmesh");
 		ms->name = savestr(mname);
+		ms->nref = 1;
 		ms->mcube.cutree = EMPTY;
 		ms->next = mlist;
 		mlist = ms;
@@ -97,7 +103,6 @@ int	flags;
 	flags &= ~ms->ldflags;
 	if (flags)
 		readmesh(ms, pathname, flags);
-	ms->nref++;			/* increase reference count */
 	return(ms);
 }
 
@@ -304,7 +309,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++) {
@@ -408,11 +413,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]];
@@ -540,8 +546,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)
@@ -609,7 +613,7 @@ FILE	*fp;
 		t2cnt += pp->nj2tris;
 	}
 	fprintf(fp, "Mesh statistics:\n");
-	fprintf(fp, "\t%d materials\n", ms->nmats);
+	fprintf(fp, "\t%ld materials\n", ms->nmats);
 	fprintf(fp, "\t%d patches (%.2f MBytes)\n", ms->npatches,
 			(ms->npatches*sizeof(MESHPATCH) +
 			vcnt*3*sizeof(uint32) +