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

Comparing ray/src/common/instance.c (file contents):
Revision 1.7 by greg, Wed May 29 17:11:32 1991 UTC vs.
Revision 2.2 by greg, Thu Aug 6 16:46:47 1992 UTC

# Line 41 | Line 41 | int  flags;
41                          error(SYSTEM, "out of memory in getscene");
42                  sc->name = savestr(sname);
43                  sc->ldflags = 0;
44 +                sc->scube.cutree = EMPTY;
45 +                sc->scube.cuorg[0] = sc->scube.cuorg[1] =
46 +                                sc->scube.cuorg[2] = 0.;
47 +                sc->scube.cusize = 0.;
48 +                sc->firstobj = sc->nobjs = 0;
49                  sc->next = slist;
50                  slist = sc;
51          }
# Line 48 | Line 53 | int  flags;
53                  sprintf(errmsg, "cannot find octree file \"%s\"", sname);
54                  error(USER, errmsg);
55          }
56 +        if (flags & ~sc->ldflags & IO_SCENE)
57 +                sc->firstobj = nobjects;
58          readoct(pathname, flags & ~sc->ldflags, &sc->scube, NULL);
59 +        if (flags & ~sc->ldflags & IO_SCENE)
60 +                sc->nobjs = nobjects - sc->firstobj;
61          sc->ldflags |= flags;
62          return(sc);
63   }
# Line 85 | Line 94 | int  flags;
94   freeinstance(o)         /* free memory associated with instance */
95   OBJREC  *o;
96   {
97 +        if (o->os == NULL)
98 +                return;
99          free(o->os);
100 +        o->os = NULL;
101   }

Diff Legend

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