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

Comparing ray/src/gen/mkillum2.c (file contents):
Revision 2.18 by greg, Thu Sep 13 06:31:21 2007 UTC vs.
Revision 2.19 by greg, Tue Sep 18 03:35:09 2007 UTC

# Line 38 | Line 38 | newdist(                       /* allocate & clear distribution array */
38                  free((void *)distarr);
39                  distarr = (COLORV *)malloc(sizeof(COLORV)*3*siz);
40                  if (distarr == NULL)
41 <                        error(SYSTEM, "Out of memory in distalloc");
41 >                        error(SYSTEM, "Out of memory in newdist");
42                  distsiz = siz;
43          }
44          memset(distarr, '\0', sizeof(COLORV)*3*siz);
# Line 94 | Line 94 | rayclean()                     /* finish all pending rays */
94   }
95  
96  
97 < int /* XXX type conflict with otypes.h */
97 > int
98   my_default(     /* default illum action */
99          OBJREC  *ob,
100          struct illum_args  *il,
# Line 130 | Line 130 | my_face(               /* make an illum face */
130          fa = getface(ob);
131          if (fa->area == 0.0) {
132                  freeface(ob);
133 <                return(o_default(ob, il, nm));
133 >                return(my_default(ob, il, nm));
134          }
135                                  /* set up sampling */
136          if (il->sampdens <= 0)
# Line 195 | Line 195 | my_face(               /* make an illum face */
195                          rayclean();
196                          freeface(ob);
197                          free((void *)distarr);
198 <                        return(o_default(ob, il, nm));
198 >                        return(my_default(ob, il, nm));
199                      }
200                      for (j = 0; j < 3; j++)
201                          org[j] += .001*fa->norm[j];

Diff Legend

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