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

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.33 by greg, Mon Apr 6 21:09:07 2020 UTC vs.
Revision 2.36 by greg, Wed Apr 6 15:28:18 2022 UTC

# Line 251 | Line 251 | main(int  argc, char  *argv[])
251                          goto badopt;
252                  }
253          }
254 <        if (nproc > 1) {
255 <                if (persist)
256 <                        error(USER, "multiprocessing incompatible with persist file");
257 <                if (!vresolu && hresolu > 0 && hresolu < nproc)
258 <                        error(WARNING, "number of cores should not exceed horizontal resolution");
259 <                if (trace != NULL)
260 <                        error(WARNING, "multiprocessing does not work properly with trace mode");
261 <        }
254 >        if (nproc > 1 && persist)
255 >                error(USER, "multiprocessing incompatible with persist file");
256                                          /* initialize object types */
257          initotypes();
258                                          /* initialize urand */
# Line 341 | Line 335 | main(int  argc, char  *argv[])
335                  setambient();           /* initialize ambient calculation */
336          } else
337                  distantsources();       /* else mark only distant sources */
338 +
339 +        fflush(stdout);                 /* in case we're duplicating header */
340 +
341   #ifdef  PERSIST
342          if (persist) {
346 –                fflush(stdout);
343                                                  /* reconnect stdout */
344                  dup2(duped1, fileno(stdout));
345                  close(duped1);

Diff Legend

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