--- ray/src/util/rad.c 2004/03/26 21:36:19 2.76 +++ ray/src/util/rad.c 2004/10/04 04:42:33 2.79 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rad.c,v 2.76 2004/03/26 21:36:19 schorsch Exp $"; +static const char RCSid[] = "$Id: rad.c,v 2.79 2004/10/04 04:42:33 greg Exp $"; #endif /* * Executive program for oconv, rpict and pfilt @@ -281,8 +281,11 @@ checklast( /* check files and find most recent */ return(0); while ((fnames = nextword(thisfile, PATH_MAX, fnames)) != NULL) { if (thisfile[0] == '!' || - (thisfile[0] == '\\' && thisfile[1] == '!')) + (thisfile[0] == '\\' && thisfile[1] == '!')) { + if (!lastdate) + lastdate = 1; continue; + } if (!(thisdate = fdate(thisfile))) syserr(thisfile); if (thisdate > lastdate) @@ -469,7 +472,7 @@ static void oconv(void) /* run oconv and mkillum if necessary */ { static char illumtmp[] = "ilXXXXXX"; - char combuf[PATH_MAX], ocopts[64], mkopts[64]; + char combuf[PATH_MAX], ocopts[64], mkopts[1024]; oconvopts(ocopts); /* get options */ if (octreedate < scenedate) { /* check date on original octree */ @@ -596,12 +599,17 @@ oconvopts( /* get oconv options */ static void mkillumopts( /* get mkillum options */ - register char *mo + char *mo ) { /* BEWARE: This may be called via setdefaults(), so no assumptions */ - *mo = '\0'; + if (nprocs > 1) { + sprintf(mo, " -n %d", nprocs); + while (*mo) + mo++; + } else + *mo = '\0'; if (vdef(MKILLUM)) addarg(mo, vval(MKILLUM)); } @@ -1307,8 +1315,10 @@ rpict( /* run rpict and pfilt for each view */ zopt, oct1name, rawfile); if (pfile != NULL && inchild()) { /* rpict persistent mode */ - if (!silent) + if (!silent) { printf("\t%s\n", combuf); + fflush(stdout); + } sprintf(combuf, "rpict%s %s %s%s%s %s > %s", rep, rppopt, res, po, opts, oct1name, rawfile);