--- ray/src/gen/mkillum.c	1991/07/25 15:31:30	1.9
+++ ray/src/gen/mkillum.c	1991/08/13 14:43:49	1.11
@@ -18,6 +18,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  SAMPDENS	48		/* points per projected steradian */
 #define  NSAMPS		32		/* samples per point */
 #define  DFLMAT		"illum_mat"	/* material name */
+#define  DFLDAT		"illum"		/* data file name */
 				/* selection options */
 #define  S_NONE		0		/* select none */
 #define  S_ELEM		1		/* select specified element */
@@ -36,7 +37,7 @@ struct rtproc	rt;		/* our rtrace process */
 struct illum_args  thisillum = {	/* our illum and default values */
 		0,
 		DFLMAT,
-		DFLMAT,
+		DFLDAT,
 		0,
 		VOIDID,
 		SAMPDENS,
@@ -257,6 +258,7 @@ char	*nm;
 				break;
 			if (!*++cp) {
 				strcpy(thisillum.datafile,thisillum.matname);
+				thisillum.dfnum = 0;
 				thisillum.flags &= ~IL_DATCLB;
 				continue;
 			}
@@ -369,8 +371,8 @@ char	*nm;
 
 printopts()			/* print out option default values */
 {
-	printf("m=%s\t\t\t# material name\n", thisillum.matname);
-	printf("f=%s\t\t\t# data file name\n", thisillum.datafile);
+	printf("m=%-15s\t\t# material name\n", thisillum.matname);
+	printf("f=%-15s\t\t# data file name\n", thisillum.datafile);
 	printf("c=n\t\t\t\t# color none\n");
 	printf("d=%d\t\t\t\t# density of points\n", thisillum.sampdens);
 	printf("s=%d\t\t\t\t# samples per point\n", thisillum.nsamps);