Commit be14827f authored by Ken Martin's avatar Ken Martin
Browse files

fixes from Will

parent e629f6cd
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
typedef double (*SqMatPtr)[4]; typedef double (*SqMatPtr)[4];
vtkCxxRevisionMacro(vtkProp3D, "1.31"); vtkCxxRevisionMacro(vtkProp3D, "1.32");
// Construct with the following defaults: origin(0,0,0) // Construct with the following defaults: origin(0,0,0)
// position=(0,0,0) and orientation=(0,0,0). No user defined // position=(0,0,0) and orientation=(0,0,0). No user defined
...@@ -544,6 +544,7 @@ void vtkProp3D::PokeMatrix(vtkMatrix4x4 *matrix) ...@@ -544,6 +544,7 @@ void vtkProp3D::PokeMatrix(vtkMatrix4x4 *matrix)
{ {
this->SetUserMatrix(this->CachedProp3D->UserMatrix); this->SetUserMatrix(this->CachedProp3D->UserMatrix);
} }
this->CachedProp3D->SetUserTransform(NULL);
this->Transform->SetMatrix(this->CachedProp3D->GetMatrix()); this->Transform->SetMatrix(this->CachedProp3D->GetMatrix());
this->Modified(); this->Modified();
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment