--- ray/src/ot/o_instance.c	1989/10/24 13:57:42	1.4
+++ ray/src/ot/o_instance.c	2003/02/22 02:07:26	2.2
@@ -1,9 +1,6 @@
-/* Copyright (c) 1988 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: o_instance.c,v 2.2 2003/02/22 02:07:26 greg Exp $";
 #endif
-
 /*
  *  o_instance.c - routines for creating octrees for other octrees.
  *
@@ -14,6 +11,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "object.h"
 
+#include  "octree.h"
+
 #include  "instance.h"
 
 #include  "plocate.h"
@@ -66,7 +65,7 @@ CUBE  *cu;
 			if (i & 1<<j)
 				v1[j] += cu->cusize;
 		}
-		multp3(v2, v1, in->b.xfm);
+		multp3(v2, v1, in->x.b.xfm);
 		if (j = plocate(v2, cumin, cumax))
 			vout++;
 		vloc &= j;
@@ -87,7 +86,7 @@ CUBE  *cu;
 			if (i & 1<<j)
 				v1[j] += in->obj->scube.cusize;
 		}
-		multp3(vert[i], v1, in->f.xfm);
+		multp3(vert[i], v1, in->x.f.xfm);
 		if (j = plocate(vert[i], cumin, cumax))
 			vloc &= j;
 		else