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

Comparing ray/src/rt/m_clip.c (file contents):
Revision 2.2 by greg, Wed Jan 12 16:46:37 1994 UTC vs.
Revision 2.3 by greg, Mon Feb 12 17:04:08 1996 UTC

# Line 30 | Line 30 | register RAY  *r;
30          register int  i;
31  
32          if ((modset = (OBJECT *)m->os) == NULL) {
33 <                register OBJECT  mod;
33 >                OBJECT  obj, mod;
34  
35                  if (m->oargs.nsargs < 1 || m->oargs.nsargs > MAXSET)
36                          objerror(m, USER, "bad # arguments");
37 +                obj = objndx(m);
38                  modset = (OBJECT *)malloc((m->oargs.nsargs+1)*sizeof(OBJECT));
39                  if (modset == NULL)
40                          error(SYSTEM, "out of memory in m_clip");
# Line 41 | Line 42 | register RAY  *r;
42                  for (i = 0; i < m->oargs.nsargs; i++) {
43                          if (!strcmp(m->oargs.sarg[i], VOIDID))
44                                  continue;
45 <                        if ((mod = modifier(m->oargs.sarg[i])) == OVOID) {
45 >                        if ((mod = lastmod(obj, m->oargs.sarg[i])) == OVOID) {
46                                  sprintf(errmsg, "unknown modifier \"%s\"",
47                                                  m->oargs.sarg[i]);
48                                  objerror(m, WARNING, errmsg);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines