Commit 7e3f6029 authored by Scott Wittenburg's avatar Scott Wittenburg Committed by Kitware Robot

Merge topic 'context2d-fix-reassignment-before-use-warning'

26a48d43 Fix warning about variable reassignment before use
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ken Martin's avatarKen Martin <ken.martin@kitware.com>
Merge-request: !4728
parents 7d88b861 26a48d43
......@@ -946,8 +946,6 @@ bool vtkLabeledContourPolyDataItem::Private::SetViewInfo(vtkContextScene* contex
return false;
}
vtkMatrix4x4 *mat = cam->GetModelViewTransformMatrix();
this->CameraRight.Set(1.0, 0.0, 0.0);
this->CameraUp.Set(0.0, 1.0, 0.0);
this->CameraForward.Set(0.0, 0.0, -1.0);
......@@ -969,7 +967,7 @@ bool vtkLabeledContourPolyDataItem::Private::SetViewInfo(vtkContextScene* contex
// Get the mvp (mcdc) matrix
double mvp[16];
mat = cam->GetCompositeProjectionTransformMatrix(aspect, -1, 1);
vtkMatrix4x4 *mat = cam->GetCompositeProjectionTransformMatrix(aspect, -1, 1);
vtkMatrix4x4::DeepCopy(mvp, mat);
vtkTransform2D* xform2D = transform->GetTransform();
......
Markdown is supported
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