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

Comparing ray/src/common/modobject.c (file contents):
Revision 2.11 by greg, Tue Sep 30 00:13:58 2003 UTC vs.
Revision 2.12 by greg, Wed Jul 14 02:37:23 2004 UTC

# Line 32 | Line 32 | register OBJREC  *op;
32  
33          for (i = nobjects>>OBJBLKSHFT; i >= 0; i--) {
34                  j = op - objblock[i];
35 <                if (j >= 0 && j < OBJBLKSIZ)
35 >                if ((j >= 0) & (j < OBJBLKSIZ))
36                          return((i<<OBJBLKSHFT) + j);
37          }
38          return(OVOID);
# Line 48 | Line 48 | char  *mname;
48          register int  i;
49  
50          i = modifier(mname);            /* try hash table first */
51 <        if (i < obj)
51 >        if ((obj == OVOID) | (i < obj))
52                  return(i);
53          for (i = obj; i-- > 0; ) {      /* need to search */
54                  op = objptr(i);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines