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.18 by greg, Sat Dec 12 19:01:00 2009 UTC vs.
Revision 2.20 by greg, Sun Dec 13 19:39:51 2009 UTC

# Line 88 | Line 88 | main(int  argc, char  *argv[])
88                  ;
89          addobjnotify[i] = tranotify;
90                                          /* set our defaults */
91 +        rand_samp = 1;
92          maxdepth = -10;
93          minweight = 2e-3;
94                                          /* option city */
# Line 251 | Line 252 | main(int  argc, char  *argv[])
252          if (nproc > 1) {
253                  if (persist)
254                          error(USER, "multiprocessing incompatible with persist file");
254 –                if (imm_irrad)
255 –                        error(USER, "multiprocessing incompatible with immediate irradiance");
255                  if (hresolu > 0 && hresolu < nproc)
256                          error(WARNING, "number of cores should not exceed horizontal resolution");
257                  if (trace != NULL)
# Line 354 | Line 353 | runagain:
353          if (persist)
354                  dupheader();                    /* send header to stdout */
355   #endif
357 –        if (nproc > 1)                  /* start multiprocessing */
358 –                ray_popen(nproc);
356                                          /* trace rays */
357 <        rtrace(NULL);
357 >        rtrace(NULL, nproc);
358                                          /* flush ambient file */
359          ambsync();
360   #ifdef  PERSIST

Diff Legend

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