--- ray/src/rt/raytrace.c	1995/01/06 14:00:47	2.18
+++ ray/src/rt/raytrace.c	1995/09/29 10:46:12	2.20
@@ -1,4 +1,4 @@
-/* Copyright (c) 1994 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -195,8 +195,11 @@ int  mod;
 			error(USER, errmsg);
 		}
 		******/
-		if ((*ofun[m->otype].funp)(m, r))
-			objerror(r->ro, USER, "conflicting materials");
+		if ((*ofun[m->otype].funp)(m, r)) {
+			sprintf(errmsg, "conflicting material \"%s\"",
+					m->oname);
+			objerror(r->ro, USER, errmsg);
+		}
 	}
 	depth--;			/* end here */
 }
@@ -396,8 +399,8 @@ register CUBE  *scene;
 			return(0);
 	}
 	cxset[0] = 0;
-	return(raymove(curpos, cxset, sflags, r, scene) == RAYHIT &&
-			r->ro != &Aftplane);
+	raymove(curpos, cxset, sflags, r, scene);
+	return(r->ro != NULL & r->ro != &Aftplane);
 }