--- ray/src/util/glare.csh	1991/05/08 11:08:01	1.10
+++ ray/src/util/glare.csh	1995/05/02 10:23:42	2.2
@@ -7,10 +7,15 @@ set fgargs=(-v)
 set nofile="none"
 set octree=$nofile
 set picture=$nofile
+set glarefile=$nofile
 if ($#argv >= 1) then
 	set glarefile=$argv[1]
-else
-	set glarefile=$nofile
+	if ($#argv >= 2) then
+		set picture=$argv[2]
+		if ($#argv >= 3) then
+			set octree=$argv[3]
+		endif
+	endif
 endif
 set rtargs=
 set view=
@@ -55,8 +60,12 @@ so the view specification is optional unless you are s
 octree.
 
 _EOF_
-	readvar picture
-	readvar octree
+	if ( $picture == $nofile ) then
+		readvar picture
+	endif
+	if ( $octree == $nofile ) then
+		readvar octree
+	endif
 	readvar view
 	if ( $picture == $nofile && $octree == $nofile ) then
 		echo "You must specify a picture or an octree"
@@ -71,7 +80,10 @@ _EOF_
 			echo "Cannot read $picture"
 			exit 1
 		endif
-		set fgargs=($fgargs -p $picture -vf $picture)
+		set fgargs=($fgargs -p $picture)
+		if ( "$view" != "" ) then
+			set view=(-vf $picture $view)
+		endif
 	endif
 	set fgargs=($fgargs $view)
 	if ( $octree != $nofile ) then
@@ -135,6 +147,11 @@ _EOF_
 	echo "Starting calculation..."
 	echo findglare $fgargs
 	findglare $fgargs > $glarefile
+	if ($status) then
+		echo "Uh-oh.  Something went wrong with findglare\!"
+		rm $glarefile
+		exit 1
+	endif
 endif
 if ($?DISPLAY && $picture != $nofile) then
 	echo ""