Merge topic 'proppicker-orientation-change-bug' into master

e7615367 BUG: Wrong transformation used to restore original parameters

Rendering/Core/vtkProp3D.cxx

@@ -579,7 +579,7 @@ void vtkProp3D::PokeMatrix(vtkMatrix4x4 *matrix)
       this->SetUserMatrix(this->CachedProp3D->UserMatrix);
       }
     this->CachedProp3D->SetUserTransform(NULL);
-    this->Transform->SetMatrix(this->CachedProp3D->GetMatrix());
+    this->Transform->SetMatrix(this->CachedProp3D->Transform->GetMatrix());
     this->Modified();
     }
 }