--- ray/src/rt/raytrace.c	1995/01/26 15:34:55	2.19
+++ ray/src/rt/raytrace.c	1995/09/29 10:46:12	2.20
@@ -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 */
 }