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.12 by greg, Thu Jun 21 17:14:32 2012 UTC

#	Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9		#include "rcontrib.h"
10		#include "source.h"
11		#include "otypes.h"
12	–	#include "platform.h"
12
13		char    *shm_boundary = NULL;           /* boundary of shared memory */
14
#	Line 336 | Line 335 | rcontrib()
335		if (raysleft && !--raysleft)
336		break;          /* preemptive EOI */
337		}
338	<	if ((accumulate <= 0) | (account < accumulate)) {
338	>	if (nchild != -1 && (accumulate <= 0) | (account < accumulate)) {
339		if (account < accumulate) {
340		error(WARNING, "partial accumulation in final record");
341		accumulate -= account;

Diff Legend

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