--- ray/src/util/wrapBSDF.c	2015/02/16 19:11:28	2.7
+++ ray/src/util/wrapBSDF.c	2015/02/20 17:05:40	2.10
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: wrapBSDF.c,v 2.7 2015/02/16 19:11:28 greg Exp $";
+static const char RCSid[] = "$Id: wrapBSDF.c,v 2.10 2015/02/20 17:05:40 greg Exp $";
 #endif
 /*
  * Wrap BSDF data in valid WINDOW XML file
@@ -294,14 +294,12 @@ mat_assignments(const char *caller, const char *fn, ez
 	if (xml_input == win6_template)
 	    for (i = 0; XMLfieldID[i].nickName[0]; i++)
 		if (XMLfieldID[i].win_need &&
-			!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0]) {
+			!ezxml_txt(ezxml_child(wtl,XMLfieldID[i].fullName))[0])
 			fprintf(stderr,
-			"%s: missing required '%s' assignment for WINDOW <%s>\n",
+			"%s: warning - missing '%s' assignment for WINDOW <%s>\n",
 					caller, XMLfieldID[i].nickName,
 					XMLfieldID[i].fullName);
-			return 0;
-		}
-	return 1;		/* no errors */
+	return 1;
 }
 
 /* Complete angle basis specification */
@@ -775,7 +773,7 @@ main(int argc, char *argv[])
 				UsageExit(argv[0]);
 			continue;
 		case 'c':		/* correct solid angle */
-			correct_solid_angle ^= 1;
+			correct_solid_angle = 1;
 			continue;
 		case 't':		/* transmission */
 			if (i >= argc-1)
@@ -818,7 +816,8 @@ main(int argc, char *argv[])
 				argv[i] = (char *)stdin_name;
 			}
 			data_file[ndataf].fname = argv[i];
-			data_file[ndataf++].spectrum = cur_spectrum;
+			data_file[ndataf].spectrum = cur_spectrum;
+			ndataf++;
 			continue;
 		case 's':		/* spectrum name or input file */
 			if (++i >= argc)
@@ -880,8 +879,6 @@ doneOptions:					/* get XML input */
 	} else {
 		xml_input = argv[i];
 	}
-	if ((xml_input == win6_template) & (angle_basis == ABdefault))
-		angle_basis = ABklemsFull;
 						/* wrap it! */
 	return !wrapBSDF(argv[0]);
 }