Index: Rendering/vtkInteractorStyleTrackballActor.cxx
===================================================================
RCS file: /cvsroot/VTK/VTK/Rendering/vtkInteractorStyleTrackballActor.cxx,v
retrieving revision 1.32
diff -u -r1.32 vtkInteractorStyleTrackballActor.cxx
--- a/Rendering/vtkInteractorStyleTrackballActor.cxx	16 Dec 2003 14:48:17 -0000	1.32
+++ b/Rendering/vtkInteractorStyleTrackballActor.cxx	12 Aug 2004 22:09:03 -0000
@@ -410,14 +410,11 @@
   motion_vector[1] = new_pick_point[1] - old_pick_point[1];
   motion_vector[2] = new_pick_point[2] - old_pick_point[2];
   
-  if (this->InteractionProp->GetUserMatrix() != NULL)
+  if (this->InteractionProp->GetUserTransform() != NULL)
     {
-    vtkTransform *t = vtkTransform::New();
+    vtkTransform *t = vtkTransform::SafeDownCast(this->InteractionProp->GetUserTransform());
     t->PostMultiply();
-    t->SetMatrix(this->InteractionProp->GetUserMatrix());
     t->Translate(motion_vector[0], motion_vector[1], motion_vector[2]);
-    this->InteractionProp->GetUserMatrix()->DeepCopy(t->GetMatrix());
-    t->Delete();
     }
   else
     {
@@ -462,15 +459,12 @@
   motion_vector[1] = (view_point[1] - view_focus[1]) * dollyFactor;
   motion_vector[2] = (view_point[2] - view_focus[2]) * dollyFactor;
   
-  if (this->InteractionProp->GetUserMatrix() != NULL)
+  if (this->InteractionProp->GetUserTransform() != NULL)
     {
-    vtkTransform *t = vtkTransform::New();
+    vtkTransform *t = vtkTransform::SafeDownCast(this->InteractionProp->GetUserTransform());
     t->PostMultiply();
-    t->SetMatrix(this->InteractionProp->GetUserMatrix());
     t->Translate(motion_vector[0], motion_vector[1], 
                  motion_vector[2]);
-    this->InteractionProp->GetUserMatrix()->DeepCopy(t->GetMatrix());
-    t->Delete();
     }
   else
     {
@@ -556,48 +550,51 @@
   double orig[3];
   prop3D->GetOrigin(orig);
   
-  vtkTransform *newTransform = vtkTransform::New();
-  newTransform->PostMultiply();
-  if (prop3D->GetUserMatrix() != NULL) 
+  vtkTransform *Transform;
+  
+  if (prop3D->GetUserTransform() != NULL)
     {
-    newTransform->SetMatrix(prop3D->GetUserMatrix());
+    Transform = vtkTransform::SafeDownCast(prop3D->GetUserTransform());
+    Transform->PostMultiply();
     }
-  else 
+  else
     {
-    newTransform->SetMatrix(oldMatrix);
+    Transform = vtkTransform::New();
+    Transform->PostMultiply();
+    vtkMatrix4x4 *oldMatrix = vtkMatrix4x4::New();
+    prop3D->GetMatrix(oldMatrix);
+    Transform->SetMatrix(oldMatrix);
+    Transform->Register(this);
+    Transform->Delete();
+    oldMatrix->Delete();
     }
   
-  newTransform->Translate(-(boxCenter[0]), -(boxCenter[1]), -(boxCenter[2]));
+  Transform->Translate(-(boxCenter[0]), -(boxCenter[1]), -(boxCenter[2]));
   
   for (int i = 0; i < numRotation; i++) 
     {
-    newTransform->RotateWXYZ(rotate[i][0], rotate[i][1],
+    Transform->RotateWXYZ(rotate[i][0], rotate[i][1],
                              rotate[i][2], rotate[i][3]);
     }
   
   if ((scale[0] * scale[1] * scale[2]) != 0.0) 
     {
-    newTransform->Scale(scale[0], scale[1], scale[2]);
+    Transform->Scale(scale[0], scale[1], scale[2]);
     }
   
-  newTransform->Translate(boxCenter[0], boxCenter[1], boxCenter[2]);
+  Transform->Translate(boxCenter[0], boxCenter[1], boxCenter[2]);
   
   // now try to get the composit of translate, rotate, and scale
-  newTransform->Translate(-(orig[0]), -(orig[1]), -(orig[2]));
-  newTransform->PreMultiply();
-  newTransform->Translate(orig[0], orig[1], orig[2]);
-  
-  if (prop3D->GetUserMatrix() != NULL) 
-    {
-    newTransform->GetMatrix(prop3D->GetUserMatrix());
-    }
-  else 
-    {
-    prop3D->SetPosition(newTransform->GetPosition());
-    prop3D->SetScale(newTransform->GetScale());
-    prop3D->SetOrientation(newTransform->GetOrientation());
+  Transform->Translate(-(orig[0]), -(orig[1]), -(orig[2]));
+  Transform->PreMultiply();
+  Transform->Translate(orig[0], orig[1], orig[2]);
+  
+  if (prop3D->GetUserTransform() == NULL) 
+    {
+    prop3D->SetPosition(Transform->GetPosition());
+    prop3D->SetScale(Transform->GetScale());
+    prop3D->SetOrientation(Transform->GetOrientation());
+    Transform->UnRegister(this);
     }
-  oldMatrix->Delete();
-  newTransform->Delete();
 }