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

Comparing ray/src/common/readoct.c (file contents):
Revision 2.32 by greg, Tue Feb 7 20:28:16 2023 UTC vs.
Revision 2.33 by greg, Thu Jun 8 17:39:13 2023 UTC

# Line 41 | Line 41 | readoct(                               /* read in octree file or stream */
41          char  *ofn[]
42   )
43   {
44 +        time_t  oct_t = 0;
45 +        time_t  last_it = 0;
46          char  sbuf[512];
47          int  nf;
48          int  i;
# Line 62 | Line 64 | readoct(                               /* read in octree file or stream */
64                                          inpspec);
65                          error(SYSTEM, errmsg);
66                  }
67 +                oct_t = fddate(fileno(infp));
68          }
69   #ifdef getc_unlocked                    /* avoid stupid semaphores */
70          flockfile(infp);
# Line 90 | Line 93 | readoct(                               /* read in octree file or stream */
93                          readobj(sbuf);
94                  if (load & IO_FILES)
95                          ofn[nf] = savqstr(sbuf);
96 +                if (oct_t > last_it) {
97 +                        time_t  t = fdate(sbuf);
98 +                        if (t > last_it)
99 +                                last_it = t;
100 +                }
101                  nf++;
102          }
103          if (load & IO_FILES)
# Line 114 | Line 122 | readoct(                               /* read in octree file or stream */
122                  if (nobjects != objorig+fnobjects)
123                          octerror(USER, "bad object count; octree stale?");
124                                  /* check for non-surfaces */
125 <                if (nonsurfintree(scene->cutree))
125 >                if (oct_t <= last_it && nonsurfintree(scene->cutree))
126                          octerror(USER, "modifier in tree; octree stale?");
127              }
128          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines