--- ray/src/common/mesh.h	2003/06/20 00:25:49	2.6
+++ ray/src/common/mesh.h	2003/07/14 22:23:59	2.9
@@ -1,4 +1,4 @@
-/* RCSid $Id: mesh.h,v 2.6 2003/06/20 00:25:49 greg Exp $ */
+/* RCSid $Id: mesh.h,v 2.9 2003/07/14 22:23:59 schorsch Exp $ */
 /*
  * Header for compact triangle mesh geometry
  *
@@ -6,14 +6,13 @@
  */
 #ifndef _RAD_MESH_H_
 #define _RAD_MESH_H_
+
+#include "lookup.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "copyright.h"
-
-#include "lookup.h"
-
 #ifndef BYTE
 #define BYTE	unsigned char
 #endif
@@ -79,7 +78,7 @@ typedef struct mesh {
 	int		nref;		/* reference count */
 	int		ldflags;	/* what we've loaded */
 	CUBE		mcube;		/* bounds and octree */
-	FLOAT		uvlim[2][2];	/* local coordinate extrema */
+	RREAL		uvlim[2][2];	/* local coordinate extrema */
 	OBJECT		mat0;		/* base material index */
 	OBJECT		nmats;		/* number of materials */
 	MESHPATCH	*patch;		/* mesh patch list */
@@ -106,7 +105,7 @@ typedef struct {
 	int		fl;		/* setting flags */
 	FVECT		v;		/* vertex location */
 	FVECT		n;		/* vertex normal */
-	FLOAT		uv[2];		/* local coordinates */
+	RREAL		uv[2];		/* local coordinates */
 } MESHVERT;
 
 				/* mesh format identifier */