--- ray/src/gen/xform.c	2003/07/03 22:41:44	2.29
+++ ray/src/gen/xform.c	2003/10/27 10:27:25	2.34
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: xform.c,v 2.29 2003/07/03 22:41:44 schorsch Exp $";
+static const char RCSid[] = "$Id: xform.c,v 2.34 2003/10/27 10:27:25 schorsch Exp $";
 #endif
 /*
  *  xform.c - program to transform object files.
@@ -10,12 +10,10 @@ static const char RCSid[] = "$Id: xform.c,v 2.29 2003/
  */
 
 #include  <ctype.h>
-#ifndef _WIN32
-  #include  <unistd.h>
-#endif
 
-#include  "standard.h"
 #include  "platform.h"
+#include  "rtmath.h"
+#include  "rtprocess.h" /* win_popen() */
 #include  "paths.h"
 #include  "object.h"
 #include  "otypes.h"
@@ -75,14 +73,14 @@ char  *argv[];
 		if (argv[a][0] == '-')
 			switch (argv[a][1]) {
 			case 'm':
-				if (argv[a][2] | a+1 >= argc)
+				if (argv[a][2] | (a+1 >= argc))
 					break;
 				a++;
 				if (newmod == NULL)
 					newmod = argv[a];
 				continue;
 			case 'n':
-				if (argv[a][2] | a+1 >= argc)
+				if (argv[a][2] | (a+1 >= argc))
 					break;
 				a++;
 				if (idprefix == NULL)
@@ -124,7 +122,7 @@ char  *argv[];
 
 	a += xf(&tot, argc-a, argv+a);
 
-	if (reverse = tot.sca < 0.0)
+	if ( (reverse = tot.sca < 0.0) )
 		tot.sca = -tot.sca;
 	if (invert)
 		reverse = !reverse;
@@ -223,7 +221,7 @@ int  ac, fi;
 		skipspaces:
 			while (isspace(*cp))	/* nullify spaces */
 				*cp++ = '\0';
-			if ((*cp == '"' | *cp == '\''))
+			if ((*cp == '"') | (*cp == '\''))
 				inquote = *cp++;
 			if (!*cp)		/* all done? */
 				break;
@@ -839,7 +837,8 @@ initotypes()			/* initialize ofun[] array */
 	ofun[OBJ_CYLINDER].funp =
 	ofun[OBJ_TUBE].funp = o_cylinder;
 	ofun[OBJ_RING].funp = o_ring;
-	ofun[OBJ_INSTANCE].funp = addxform;
+	ofun[OBJ_INSTANCE].funp =
+	ofun[OBJ_MESH].funp = addxform;
 	ofun[MAT_GLOW].funp = m_glow;
 	ofun[MAT_SPOT].funp = m_spot;
 	ofun[MAT_DIELECTRIC].funp = m_dielectric;