| # | Line 119 | Line 119 | findmaterial(OBJREC *o) | |
|---|---|---|
| 119 | if ((ao = findmaterial(objptr(aobj))) != NULL) | |
| 120 | return(ao); | |
| 121 | } | |
| 122 | + | if (o->omod == OVOID) { |
| 123 | /* assume unmodified mixture is material */ | |
| 124 | < | if (o->omod == OVOID) |
| 125 | < | return(ismixture(o->otype) ? o : (OBJREC *)NULL); |
| 124 | > | if (ismixture(o->otype)) |
| 125 | > | break; |
| 126 | > | return(NULL); |
| 127 | > | } |
| 128 | o = objptr(o->omod); | |
| 129 | } | |
| 130 | < | return(o); /* XXX: material mixtures will return NULL */ |
| 130 | > | return(o); |
| 131 | } | |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |