--- ray/src/rt/rcmain.c 2012/06/09 07:16:47 2.1 +++ ray/src/rt/rcmain.c 2012/06/10 05:25:42 2.2 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rcmain.c,v 2.1 2012/06/09 07:16:47 greg Exp $"; +static const char RCSid[] = "$Id: rcmain.c,v 2.2 2012/06/10 05:25:42 greg Exp $"; #endif /* * rcmain.c - main for rtcontrib ray contribution tracer @@ -14,8 +14,6 @@ static const char RCSid[] = "$Id: rcmain.c,v 2.1 2012/ #include "source.h" #include "ambient.h" -char *shm_boundary = NULL; /* boundary of shared memory */ - int gargc; /* global argc */ char **gargv; /* global argv */ char *octname; /* global octree name */ @@ -227,7 +225,7 @@ main(int argc, char *argv[]) yres = atoi(argv[++i]); break; case 'w': /* warnings */ - rval = erract[WARNING].pf != NULL; + rval = (erract[WARNING].pf != NULL); bool(2,rval); if (rval) erract[WARNING].pf = wputs; else erract[WARNING].pf = NULL; @@ -339,12 +337,7 @@ main(int argc, char *argv[]) setambient(); /* initialize ambient calculation */ - if (nproc > 1) { - preload_objs(); /* preload auxiliary data */ - /* set shared memory boundary */ - shm_boundary = strcpy((char *)malloc(16), "SHM_BOUNDARY"); - } - rcontrib(); /* trace ray contributions */ + rcontrib(); /* trace ray contributions (loop) */ ambsync(); /* flush ambient file */