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

Comparing ray/src/util/glrad.c (file contents):
Revision 3.26 by greg, Thu Apr 28 16:28:20 2016 UTC vs.
Revision 3.27 by greg, Fri Feb 28 05:18:49 2020 UTC

# Line 76 | Line 76 | char   *scene[MAXSCENE+1];             /* material and scene file l
76   int     nscenef = 0;                    /* number of scene files */
77   char    *octree;                        /* octree name (NULL if unnec.) */
78  
79 < SUBPROC rtpd;                   /* rtrace process descriptors */
79 > SUBPROC rtpd = SP_INACTIVE;             /* rtrace process descriptors */
80  
81   int     silent = 0;                     /* run rad silently? */
82   int     backvis = 1;                    /* back faces visible? */
# Line 211 | Line 211 | quit(                          /* exit gracefully */
211          if (ourdisplay != NULL)
212                  dev_close();
213          /* if (rtpd.pid > 0) { */
214 <        if (rtpd.running) {
214 >        if (rtpd.flags & PF_RUNNING) {
215                  if (close_process(&rtpd) > 0)
216                          wputs("bad exit status from rtrace\n");
217                  /* rtpd.pid = 0; */
# Line 741 | Line 741 | getintersect(          /* intersect ray with scene geometry */
741          float   fbuf[6];
742                                  /* check to see if rtrace is running */
743          /* if (rtpd.pid <= 0) */
744 <        if (!rtpd.running)
744 >        if (!(rtpd.flags & PF_RUNNING))
745                  return(0);
746                                  /* assign origin */
747          fbuf[0] = org[0]; fbuf[1] = org[1]; fbuf[2] = org[2];

Diff Legend

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