# | Line 46 | Line 46 | extern OBJREC * /* find an object's actual material | |
---|---|---|
46 | findmaterial(register OBJREC *o) | |
47 | { | |
48 | while (!ismaterial(o->otype)) { | |
49 | – | if (ismixture(o->otype)) |
50 | – | return(NULL); /* reject mixed materials */ |
49 | if (o->otype == MOD_ALIAS && o->oargs.nsargs) { | |
50 | OBJECT aobj; | |
51 | OBJREC *ao; | |
# | Line 62 | Line 60 | findmaterial(register OBJREC *o) | |
60 | return(NULL); | |
61 | o = objptr(o->omod); | |
62 | } | |
63 | < | return(o); |
63 | > | return(o); /* mixtures will return NULL */ |
64 | } | |
65 | ||
66 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |