ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/rcontrib.c

Comparing ray/src/rt/rcontrib.c (file contents):
Revision 2.10 by greg, Tue Jun 19 00:12:08 2012 UTC vs.
Revision 2.13 by greg, Fri Jun 22 22:03:02 2012 UTC

#	Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7		*/
8
9		#include "rcontrib.h"
10	–	#include "source.h"
10		#include "otypes.h"
12	–	#include "platform.h"
11
12		char    *shm_boundary = NULL;           /* boundary of shared memory */
13
#	Line 188 | Line 186 | rcinit()
186		if ((account = accumulate) > 1)
187		raysleft *= accumulate;
188		waitflush = (yres > 0) & (xres > 1) ? 0 : xres;
191	–	/* tracing to sources as well */
192	–	for (i = 0; i < nsources; i++)
193	–	source[i].sflags |= SFOLLOW;
189
190		if (nproc > 1 && in_rchild())   /* forked child? */
191		return;                 /* return to main processing loop */
#	Line 336 | Line 331 | rcontrib()
331		if (raysleft && !--raysleft)
332		break;          /* preemptive EOI */
333		}
334	<	if ((accumulate <= 0) | (account < accumulate)) {
334	>	if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) {
335		if (account < accumulate) {
336		error(WARNING, "partial accumulation in final record");
337		accumulate -= account;

Diff Legend

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