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

Comparing ray/src/rt/rcmain.c (file contents):
Revision 2.1 by greg, Sat Jun 9 07:16:47 2012 UTC vs.
Revision 2.2 by greg, Sun Jun 10 05:25:42 2012 UTC

# Line 14 | Line 14 | static const char      RCSid[] = "$Id$";
14   #include "source.h"
15   #include "ambient.h"
16  
17 – char    *shm_boundary = NULL;           /* boundary of shared memory */
18 –
17   int     gargc;                          /* global argc */
18   char    **gargv;                        /* global argv */
19   char    *octname;                       /* global octree name */
# Line 227 | Line 225 | main(int argc, char *argv[])
225                          yres = atoi(argv[++i]);
226                          break;
227                  case 'w':                       /* warnings */
228 <                        rval = erract[WARNING].pf != NULL;
228 >                        rval = (erract[WARNING].pf != NULL);
229                          bool(2,rval);
230                          if (rval) erract[WARNING].pf = wputs;
231                          else erract[WARNING].pf = NULL;
# Line 339 | Line 337 | main(int argc, char *argv[])
337  
338          setambient();                   /* initialize ambient calculation */
339  
340 <        if (nproc > 1) {
343 <                preload_objs();         /* preload auxiliary data */
344 <                                        /* set shared memory boundary */
345 <                shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY");
346 <        }
347 <        rcontrib();                     /* trace ray contributions */
340 >        rcontrib();                     /* trace ray contributions (loop) */
341  
342          ambsync();                      /* flush ambient file */
343  

Diff Legend

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