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

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.18 by greg, Sat Dec 12 19:01:00 2009 UTC vs.
Revision 2.19 by greg, Sun Dec 13 19:13:04 2009 UTC

# Line 251 | Line 251 | main(int  argc, char  *argv[])
251          if (nproc > 1) {
252                  if (persist)
253                          error(USER, "multiprocessing incompatible with persist file");
254 –                if (imm_irrad)
255 –                        error(USER, "multiprocessing incompatible with immediate irradiance");
254                  if (hresolu > 0 && hresolu < nproc)
255                          error(WARNING, "number of cores should not exceed horizontal resolution");
256                  if (trace != NULL)
# Line 354 | Line 352 | runagain:
352          if (persist)
353                  dupheader();                    /* send header to stdout */
354   #endif
357 –        if (nproc > 1)                  /* start multiprocessing */
358 –                ray_popen(nproc);
355                                          /* trace rays */
356 <        rtrace(NULL);
356 >        rtrace(NULL, nproc);
357                                          /* flush ambient file */
358          ambsync();
359   #ifdef  PERSIST

Diff Legend

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