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

Comparing ray/src/rt/rcontrib.c (file contents):
Revision 2.16 by greg, Tue Aug 14 22:25:12 2012 UTC vs.
Revision 2.17 by greg, Thu Nov 15 15:26:52 2012 UTC

# Line 316 | Line 316 | rcontrib()
316   #endif
317          while (getvec(orig) == 0 && getvec(direc) == 0) {
318                  d = normalize(direc);
319 <                if (nchild != -1 && (d == 0.0) & (accumulate != 1)) {
319 >                if (nchild != -1 && (d == 0.0) & (accumulate == 0)) {
320                          if (!ignore_warning_given++)
321                                  error(WARNING,
322                                  "dummy ray(s) ignored during accumulation\n");
# Line 327 | Line 327 | rcontrib()
327                  ++lastray;
328                  if (d == 0.0) {                         /* zero ==> flush */
329                          if ((yres <= 0) | (xres <= 0))
330 <                                waitflush = 1;          /* flush right after */
331 <                        account = 1;
330 >                                waitflush = 1;          /* flush after */
331 >                        if (nchild == -1)
332 >                                account = 1;
333                  } else if (imm_irrad) {                 /* else compute */
334                          eval_irrad(orig, direc);
335                  } else {

Diff Legend

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