--- ray/src/rt/sphere.c	1989/04/19 22:24:30	1.2
+++ ray/src/rt/sphere.c	1991/10/23 13:43:48	1.5
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -23,13 +23,19 @@ register RAY  *r;
 	double  root[2];	/* quadratic roots */
 	int  nroots;
 	double  t;
-	register double  *ap;
+	register FLOAT  *ap;
 	register int  i;
 
-	if (so->oargs.nfargs != 4 || so->oargs.farg[3] <= FTINY)
-		objerror(so, USER, "bad arguments");
-
+	if (so->oargs.nfargs != 4)
+		objerror(so, USER, "bad # arguments");
 	ap = so->oargs.farg;
+	if (ap[3] < -FTINY) {
+		objerror(so, WARNING, "negative radius");
+		so->otype = so->otype == OBJ_SPHERE ?
+				OBJ_BUBBLE : OBJ_SPHERE;
+		ap[3] = -ap[3];
+	} else if (ap[3] <= FTINY)
+		objerror(so, USER, "zero radius");
 
 	/*
 	 *	We compute the intersection by substituting into
@@ -71,8 +77,7 @@ register RAY  *r;
 		r->ron[i] = (r->rop[i] - ap[i]) / a;
 	}
 	r->rod = -DOT(r->rdir, r->ron);
-	r->rofs = 1.0; setident4(r->rofx);
-	r->robs = 1.0; setident4(r->robx);
+	r->rox = NULL;
 
 	return(1);			/* hit */
 }