Commit 1b4edd95 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'more-mtimetype-errors'

93bddde0 GetMTime: fix some missed mtime type changes
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: default avatarDavid E DeMarle <dave.demarle@kitware.com>
Merge-request: !1949
parents a1a94d0c 93bddde0
Pipeline #26027 failed with stage
in 0 seconds
......@@ -71,7 +71,7 @@ vtkMTimeType vtkDiscretizableColorTransferFunction::GetMTime()
}
if (this->LookupTable)
{
unsigned ltmtime = this->LookupTable->GetMTime();
vtkMTimeType ltmtime = this->LookupTable->GetMTime();
mtime = ltmtime > mtime? ltmtime : mtime;
}
......
......@@ -392,7 +392,7 @@ void vtkOSPRayRendererNode::Traverse(int operation)
//let's see if we can avoid that in the common case when
//the objects have not changed. Note we also cache in actornodes
//to reuse already created ospray meshes
unsigned int recent = 0;
vtkMTimeType recent = 0;
int numAct = 0; //catches removed actors
while (!it->IsDoneWithTraversal())
{
......@@ -403,12 +403,12 @@ void vtkOSPRayRendererNode::Traverse(int operation)
if (child)
{
numAct++;
recent = std::max(recent,(unsigned int)child->GetMTime());
recent = std::max(recent, child->GetMTime());
}
if (vchild)
{
numAct++;
recent = std::max(recent,(unsigned int)vchild->GetMTime());
recent = std::max(recent, vchild->GetMTime());
}
it->GoToNextItem();
......
......@@ -53,9 +53,9 @@ void vtkOSPRayVolumeNode::PrintSelf(ostream& os, vtkIndent indent)
}
//----------------------------------------------------------------------------
unsigned long vtkOSPRayVolumeNode::GetMTime()
vtkMTimeType vtkOSPRayVolumeNode::GetMTime()
{
unsigned long mtime = this->Superclass::GetMTime();
vtkMTimeType mtime = this->Superclass::GetMTime();
vtkVolume *vol = (vtkVolume*)this->GetRenderable();
if (vol->GetMTime() > mtime)
{
......
......@@ -42,7 +42,7 @@ public:
// Description:
// Overridden to take into account my renderables time, including
// mapper and data into mapper inclusive of composite input
virtual unsigned long GetMTime();
virtual vtkMTimeType GetMTime();
protected:
vtkOSPRayVolumeNode();
......
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