--- ray/src/rt/rv3.c	2005/04/19 01:15:07	2.17
+++ ray/src/rt/rv3.c	2005/09/19 02:23:58	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rv3.c,v 2.17 2005/04/19 01:15:07 greg Exp $";
+static const char	RCSid[] = "$Id: rv3.c,v 2.19 2005/09/19 02:23:58 greg Exp $";
 #endif
 /*
  *  rv3.c - miscellaneous routines for rview.
@@ -16,12 +16,8 @@ static const char	RCSid[] = "$Id: rv3.c,v 2.17 2005/04
 #include  "random.h"
 
 #ifndef WFLUSH
-#ifdef SPEED
-#define WFLUSH		(5*SPEED)
-#else
-#define WFLUSH		100		/* flush after this many rays */
+#define WFLUSH		2048		/* flush after this many rays */
 #endif
-#endif
 
 #ifdef  SMLFLT
 #define  sscanvec(s,v)	(sscanf(s,"%f %f %f",v,v+1,v+2)==3)
@@ -171,7 +167,7 @@ int  xmin, ymin, xmax, ymax;
 		setcolor(thisray.rcol, 0.0, 0.0, 0.0);
 	} else {
 		rayorigin(&thisray, PRIMARY, NULL, NULL);
-		samplendx++;
+		samplendx = rand_samp ? random() : samplendx+1;
 		rayvalue(&thisray);
 	}