Commit a876003d authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'fix-multiblock-mtime-redo'

3a1884ee

 Ensure composite polydata mapper has correct MTime
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !1640
parents 71c79620 3a1884ee
......@@ -660,6 +660,18 @@ int vtkCompositePolyDataMapper2::CanUseTextureMapForColoring(vtkDataObject*)
return this->CanUseTextureMapForColoringValue;
}
//-------------------------------------------------------------------------
bool vtkCompositePolyDataMapper2::GetNeedToRebuildBufferObjects(
vtkRenderer *ren, vtkActor *act)
{
if (vtkCompositePolyDataMapper2::Superclass::GetNeedToRebuildBufferObjects(ren, act) ||
(this->GetInput() && this->VBOBuildTime < this->GetInput()->GetMTime()))
{
return true;
}
return false;
}
//-------------------------------------------------------------------------
void vtkCompositePolyDataMapper2::BuildBufferObjects(
vtkRenderer *ren,
......
......@@ -52,6 +52,10 @@ protected:
std::map<vtkShader::Type, vtkShader *> shaders,
vtkRenderer *ren, vtkActor *act);
// Description:
// Determine if the buffer objects need to be rebuilt
virtual bool GetNeedToRebuildBufferObjects(vtkRenderer *ren, vtkActor *act);
// Description:
// Build the VBO/IBO, called by UpdateBufferObjects
virtual void BuildBufferObjects(vtkRenderer *ren, vtkActor *act);
......
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