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

Comparing ray/src/common/mesh.c (file contents):
Revision 2.35 by greg, Thu Jun 10 00:27:25 2021 UTC vs.
Revision 2.36 by greg, Thu Dec 12 19:55:57 2024 UTC

# Line 86 | Line 86 | getmesh(                               /* get new mesh data reference */
86                          ms->nref++;     /* increase reference count */
87                          break;
88                  }
89 <        if (ms == NULL) {               /* load first time */
89 >        if (ms == NULL) {               /* new mesh entry? */
90                  ms = (MESH *)calloc(1, sizeof(MESH));
91                  if (ms == NULL)
92                          error(SYSTEM, "out of memory in getmesh");
# Line 96 | Line 96 | getmesh(                               /* get new mesh data reference */
96                  ms->next = mlist;
97                  mlist = ms;
98          }
99 +        if (!(flags &= ~ms->ldflags))   /* nothing to load? */
100 +                return(ms);
101          if ((pathname = getpath(mname, getrlibpath(), R_OK)) == NULL) {
102                  sprintf(errmsg, "cannot find mesh file \"%s\"", mname);
103                  error(SYSTEM, errmsg);
104          }
105 <        flags &= ~ms->ldflags;
104 <        if (flags)
105 <                readmesh(ms, pathname, flags);
105 >        readmesh(ms, pathname, flags);
106          return(ms);
107   }
108  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines