ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/rglfile.c
(Generate patch)

Comparing ray/src/common/rglfile.c (file contents):
Revision 3.5 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 3.6 by greg, Tue Mar 11 19:29:04 2003 UTC

# Line 198 | Line 198 | FILE  *fp;
198          strcpy(sbuf, "EOF");
199          fgetword(sbuf, MAXSTR, fp);
200          ob.omod = 0;                    /* use ob.os for pointer to material */
201 <        if (!strcmp(sbuf, VOIDID))
201 >        if (!strcmp(sbuf, VOIDID) || !strcmp(sbuf, ALIASMOD))
202                  ob.os = NULL;
203          else
204                  ob.os = (char *)getmatp(sbuf);
205                                          /* get type */
206          strcpy(sbuf, "EOF");
207          fgetword(sbuf, MAXSTR, fp);
208 <        if (!strcmp(sbuf, ALIASID))
209 <                ob.otype = -1;
210 <        else if ((ob.otype = otype(sbuf)) < 0) {
208 >        if ((ob.otype = otype(sbuf)) < 0) {
209                  sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
210                  error(USER, errmsg);
211          }
# Line 216 | Line 214 | FILE  *fp;
214          fgetword(sbuf, MAXSTR, fp);
215          ob.oname = sbuf;
216                                          /* get arguments */
217 <        if (ob.otype == -1) {
217 >        if (ob.otype == MOD_ALIAS) {
218                  char  sbuf2[MAXSTR];            /* get alias */
219                  strcpy(sbuf2, "EOF");
220                  fgetword(sbuf2, MAXSTR, fp);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines