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

Comparing ray/src/rt/initotypes.c (file contents):
Revision 2.12 by schorsch, Tue Mar 30 16:13:01 2004 UTC vs.
Revision 2.17 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7  
8   #include  "copyright.h"
9  
10 < #include  "standard.h"
10 > #include  "ray.h"
11   #include  "otypes.h"
12   #include  "rtotypes.h"
13   #include  "otspecial.h"
# Line 61 | Line 61 | initotypes(void)                       /* initialize ofun array */
61          ofun[MAT_DIRECT2].funp = m_direct;
62          ofun[MAT_CLIP].funp = m_clip;
63          ofun[MAT_BRTDF].funp = m_brdf;
64 +        ofun[MAT_BSDF].funp = m_bsdf;
65          ofun[MAT_PFUNC].funp =
66          ofun[MAT_MFUNC].funp =
67          ofun[MAT_PDATA].funp =
# Line 90 | Line 91 | initotypes(void)                       /* initialize ofun array */
91   extern int
92   o_default(OBJREC *o, RAY *r)                    /* default action is error */
93   {
94 <        error(INTERNAL, "unexpected object call");
95 <                                /* call to pull in freeobjmem.o */ /* XXX ? */
94 >        objerror(o, CONSISTENCY, "unexpected object call");
95 >                                /* unused call to load freeobjmem.o */
96          free_objs(0, 0);
97 +        return(0);
98   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines