Commit 01e24f10 authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot
Browse files

Merge topic 'fix_lic_enable'

3c7e49e1

 lic enable and disable was nto working properly
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1881
parents b4b6f29d 3c7e49e1
Pipeline #23668 canceled with stage
......@@ -35,6 +35,7 @@
#include "vtkUnsignedCharArray.h"
#include "vtkMultiBlockDataSet.h"
#include "vtkMultiPieceDataSet.h"
#include "vtkSurfaceLICInterface.h"
#include <algorithm>
......@@ -544,7 +545,8 @@ void vtkCompositeSurfaceLICMapper::Render(vtkRenderer *ren, vtkActor *actor)
else // otherwise just reinitialize the shaders
{
// if we have changed recopy our mapper settings to the helpers
if (this->GetMTime() > this->HelperMTime)
if (this->GetMTime() > this->HelperMTime ||
this->LICInterface->GetMTime() > this->HelperMTime)
{
std::map<const vtkDataSet*, vtkCompositeLICHelper *>::iterator miter
= this->Helpers.begin();
......@@ -552,6 +554,7 @@ void vtkCompositeSurfaceLICMapper::Render(vtkRenderer *ren, vtkActor *actor)
{
this->CopyMapperValuesToHelper(miter->second);
}
this->HelperMTime.Modified();
}
}
......
......@@ -159,6 +159,7 @@ void vtkSurfaceLICInterface::ShallowCopy(vtkSurfaceLICInterface *m)
this->SetMaskThreshold(m->GetMaskThreshold());
this->SetMaskIntensity(m->GetMaskIntensity());
this->SetMaskColor(m->GetMaskColor());
this->SetEnable(m->GetEnable());
}
void vtkSurfaceLICInterface::UpdateCommunicator(
......
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