# | Line 195 | Line 195 | int mod; | |
---|---|---|
195 | error(USER, errmsg); | |
196 | } | |
197 | ******/ | |
198 | < | if ((*ofun[m->otype].funp)(m, r)) |
199 | < | objerror(r->ro, USER, "conflicting materials"); |
198 | > | if ((*ofun[m->otype].funp)(m, r)) { |
199 | > | sprintf(errmsg, "conflicting material \"%s\"", |
200 | > | m->oname); |
201 | > | objerror(r->ro, USER, errmsg); |
202 | > | } |
203 | } | |
204 | depth--; /* end here */ | |
205 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |