--- ray/src/common/instance.c	1989/07/27 22:25:56	1.3
+++ ray/src/common/instance.c	1991/05/29 17:11:32	1.7
@@ -1,4 +1,4 @@
-/* Copyright (c) 1988 Regents of the University of California */
+/* Copyright (c) 1990 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -28,7 +28,7 @@ int  flags;
 	char  *pathname;
 	register SCENE  *sc;
 
-	flags &= ~IO_FILES;			/* not allowed */
+	flags &= ~(IO_FILES|IO_INFO);		/* not allowed */
 	for (sc = slist; sc != NULL; sc = sc->next)
 		if (!strcmp(sname, sc->name)) {
 			if ((sc->ldflags & flags) == flags)
@@ -66,22 +66,24 @@ int  flags;
 			error(SYSTEM, "out of memory in getinstance");
 		if (o->oargs.nsargs < 1)
 			objerror(o, USER, "bad # of arguments");
-		in->f.sca = 1.0;
-		setident4(in->f.xfm);
-		if (xf(in->f.xfm, &in->f.sca, o->oargs.nsargs-1,
+		if (fullxf(&in->x, o->oargs.nsargs-1,
 				o->oargs.sarg+1) != o->oargs.nsargs-1)
 			objerror(o, USER, "bad transform");
-		if (in->f.sca < 0.0)
-			in->f.sca = -in->f.sca;
-		in->b.sca = 1.0;
-		setident4(in->b.xfm);
-		invxf(in->b.xfm, &in->b.sca,o->oargs.nsargs-1,o->oargs.sarg+1);
-		if (in->b.sca < 0.0)
-			in->b.sca = -in->b.sca;
+		if (in->x.f.sca < 0.0)
+			in->x.f.sca = -in->x.f.sca;
+		if (in->x.b.sca < 0.0)
+			in->x.b.sca = -in->x.b.sca;
 		in->obj = NULL;
 		o->os = (char *)in;
 	}
 	if (in->obj == NULL || (in->obj->ldflags & flags) != flags)
 		in->obj = getscene(o->oargs.sarg[0], flags);
 	return(in);
+}
+
+
+freeinstance(o)		/* free memory associated with instance */
+OBJREC  *o;
+{
+	free(o->os);
 }