ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/rcontrib.c
(Generate patch)

Comparing ray/src/rt/rcontrib.c (file contents):
Revision 2.8 by greg, Sat Jun 16 17:09:49 2012 UTC vs.
Revision 2.11 by greg, Tue Jun 19 01:27:13 2012 UTC

# Line 137 | Line 137 | addmodifier(char *modn, char *outf, char *binv, int bi
137   }
138  
139  
140 < /* add modifiers from a file list */
140 > /* Add modifiers from a file list */
141   void
142   addmodfile(char *fname, char *outf, char *binv, int bincnt)
143   {
# Line 159 | Line 159 | quit(                  /* quit program */
159   )
160   {
161          if (nchild > 0)         /* close children if any */
162 <                end_children();
162 >                end_children(code != 0);
163          exit(code);
164   }
165  
# Line 336 | Line 336 | rcontrib()
336                  if (raysleft && !--raysleft)
337                          break;          /* preemptive EOI */
338          }
339 <        if ((accumulate <= 0) | (account < accumulate)) {
339 >        if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) {
340                  if (account < accumulate) {
341                          error(WARNING, "partial accumulation in final record");
342                          accumulate -= account;
# Line 344 | Line 344 | rcontrib()
344                  account = 1;            /* output accumulated totals */
345                  done_contrib();
346          }
347 +        lu_done(&ofiletab);             /* close output files */
348          if (raysleft)
349                  error(USER, "unexpected EOF on input");
349 –        lu_done(&ofiletab);             /* close output files */
350   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)