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

Comparing ray/src/common/readoct.c (file contents):
Revision 1.12 by greg, Thu Apr 18 13:01:28 1991 UTC vs.
Revision 1.13 by greg, Mon Aug 5 08:58:52 1991 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1986 Regents of the University of California */
1 > /* Copyright (c) 1991 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 96 | Line 96 | char  *ofn[];
96                                  }
97                          while (getobj() != OVOID)
98                                  ;
99 +                } else if (load & IO_SCENE) {           /* consistency checks */
100 +                                                /* check object count */
101 +                        if (nobjects != objorig+fnobjects)
102 +                                octerror(USER, "bad object count; octree stale?");
103 +                                                /* check for non-surfaces */
104 +                        if (nonsurfinset(objorig, fnobjects))
105 +                                octerror(USER, "non-surface in set; octree stale?");
106                  }
107          }
108          fclose(infp);
102 –                                        /* consistency checks */
103 –        if (load & IO_SCENE) {
104 –                                        /* check object count */
105 –                if (nobjects != objorig+fnobjects)
106 –                        octerror(USER, "bad object count; octree stale?");
107 –                                        /* check for non-surfaces */
108 –                if (nonsurfinset(objorig, fnobjects))
109 –                        octerror(USER, "non-surface in set; octree stale?");
110 –        }
109          return(nf);
110   }
111  

Diff Legend

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