Skip to content

Commit

Permalink
Rename LabeledContourMapper::BuildTime to avoid shadowing superclass.
Browse files Browse the repository at this point in the history
vtkMapper also has a BuildTime ivar that is still needed for the OpenGL
backend.
  • Loading branch information
David C. Lonie committed Jun 20, 2016
1 parent 636aa17 commit 1fcd833
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Rendering/Core/vtkLabeledContourMapper.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ void vtkLabeledContourMapper::Render(vtkRenderer *ren, vtkActor *act)
}

this->Internal->PrepareTime = vtkTimerLog::GetUniversalTime() - startPrep;
this->BuildTime.Modified();
this->LabelBuildTime.Modified();
}

double startRender = vtkTimerLog::GetUniversalTime();
Expand Down Expand Up @@ -431,7 +431,7 @@ void vtkLabeledContourMapper::PrintSelf(ostream& os, vtkIndent indent)
<< indent << "StencilQuadsSize: " << this->StencilQuadsSize << "\n"
<< indent << "StencilQuadIndicesSize: "
<< this->StencilQuadIndicesSize << "\n"
<< indent << "BuildTime: " << this->BuildTime.GetMTime() << "\n"
<< indent << "BuildTime: " << this->LabelBuildTime.GetMTime() << "\n"
<< indent << "PolyDataMapper:\n";
this->PolyDataMapper->PrintSelf(os, indent.GetNextIndent());
os << indent << "TextProperties:\n";
Expand Down Expand Up @@ -548,8 +548,8 @@ bool vtkLabeledContourMapper::CheckRebuild(vtkRenderer *, vtkActor *act)
}

// Are we out of date?
if (this->BuildTime.GetMTime() < this->GetInput()->GetMTime() ||
this->BuildTime.GetMTime() < tPropMTime)
if (this->LabelBuildTime.GetMTime() < this->GetInput()->GetMTime() ||
this->LabelBuildTime.GetMTime() < tPropMTime)
{
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion Rendering/Core/vtkLabeledContourMapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ class VTKRENDERINGCORE_EXPORT vtkLabeledContourMapper : public vtkMapper
vtkIdType StencilQuadIndicesSize;
void FreeStencilQuads();

vtkTimeStamp BuildTime;
vtkTimeStamp LabelBuildTime;

private:
vtkLabeledContourMapper(const vtkLabeledContourMapper&); // Not implemented.
Expand Down

0 comments on commit 1fcd833

Please sign in to comment.