--- ray/src/gen/xform.c	2011/02/19 05:06:24	2.43
+++ ray/src/gen/xform.c	2011/08/15 19:48:06	2.46
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: xform.c,v 2.43 2011/02/19 05:06:24 greg Exp $";
+static const char RCSid[] = "$Id: xform.c,v 2.46 2011/08/15 19:48:06 greg Exp $";
 #endif
 /*
  *  xform.c - program to transform object files.
@@ -106,7 +106,7 @@ main(		/* get transform options and transform file */
 					sprintf(newp, "%s.%s",
 							idprefix, argv[a]);
 					if (mal_prefix++)
-						free((void *)idprefix);
+						free(idprefix);
 					idprefix = newp;
 				}
 				continue;
@@ -167,7 +167,7 @@ main(		/* get transform options and transform file */
 		}
 
 	if (mal_prefix)
-		free((void *)idprefix);
+		free(idprefix);
 	return(0);
 }
 
@@ -284,7 +284,7 @@ doargf(			/* take argument list from file */
 			sprintf(newid, "%s.%d", oldid, k);
 		err |= main(newac, avp);
 		if (newid != newidbuf)
-			free((void *)newid);
+			free(newid);
 		k++;
 	}
 	fclose(argfp);
@@ -914,7 +914,6 @@ initotypes(void)			/* initialize ofun[] array */
 	ofun[MAT_DIELECTRIC].funp = m_dielectric;
 	ofun[MAT_INTERFACE].funp = m_interface;
 	ofun[MAT_MIST].funp = m_mist;
-	ofun[MAT_BSDF].funp = addxform;
 	ofun[PAT_CTEXT].funp =
 	ofun[PAT_BTEXT].funp =
 	ofun[MIX_TEXT].funp = text;
@@ -930,6 +929,7 @@ initotypes(void)			/* initialize ofun[] array */
 	tinvers[OBJ_CYLINDER] = OBJ_TUBE;
 	tinvers[OBJ_TUBE] = OBJ_CYLINDER;
 	tinvers[OBJ_INSTANCE] = OBJ_INSTANCE;	/* oh, well */
+	tinvers[OBJ_MESH] = OBJ_MESH;		/* ditto */
 }