Commit 93bddde0 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

GetMTime: fix some missed mtime type changes

parent a1a94d0c
Pipeline #26012 passed with stage
...@@ -71,7 +71,7 @@ vtkMTimeType vtkDiscretizableColorTransferFunction::GetMTime() ...@@ -71,7 +71,7 @@ vtkMTimeType vtkDiscretizableColorTransferFunction::GetMTime()
} }
if (this->LookupTable) if (this->LookupTable)
{ {
unsigned ltmtime = this->LookupTable->GetMTime(); vtkMTimeType ltmtime = this->LookupTable->GetMTime();
mtime = ltmtime > mtime? ltmtime : mtime; mtime = ltmtime > mtime? ltmtime : mtime;
} }
......
...@@ -392,7 +392,7 @@ void vtkOSPRayRendererNode::Traverse(int operation) ...@@ -392,7 +392,7 @@ void vtkOSPRayRendererNode::Traverse(int operation)
//let's see if we can avoid that in the common case when //let's see if we can avoid that in the common case when
//the objects have not changed. Note we also cache in actornodes //the objects have not changed. Note we also cache in actornodes
//to reuse already created ospray meshes //to reuse already created ospray meshes
unsigned int recent = 0; vtkMTimeType recent = 0;
int numAct = 0; //catches removed actors int numAct = 0; //catches removed actors
while (!it->IsDoneWithTraversal()) while (!it->IsDoneWithTraversal())
{ {
...@@ -403,12 +403,12 @@ void vtkOSPRayRendererNode::Traverse(int operation) ...@@ -403,12 +403,12 @@ void vtkOSPRayRendererNode::Traverse(int operation)
if (child) if (child)
{ {
numAct++; numAct++;
recent = std::max(recent,(unsigned int)child->GetMTime()); recent = std::max(recent, child->GetMTime());
} }
if (vchild) if (vchild)
{ {
numAct++; numAct++;
recent = std::max(recent,(unsigned int)vchild->GetMTime()); recent = std::max(recent, vchild->GetMTime());
} }
it->GoToNextItem(); it->GoToNextItem();
......
...@@ -53,9 +53,9 @@ void vtkOSPRayVolumeNode::PrintSelf(ostream& os, vtkIndent indent) ...@@ -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(); vtkVolume *vol = (vtkVolume*)this->GetRenderable();
if (vol->GetMTime() > mtime) if (vol->GetMTime() > mtime)
{ {
......
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
// Description: // Description:
// Overridden to take into account my renderables time, including // Overridden to take into account my renderables time, including
// mapper and data into mapper inclusive of composite input // mapper and data into mapper inclusive of composite input
virtual unsigned long GetMTime(); virtual vtkMTimeType GetMTime();
protected: protected:
vtkOSPRayVolumeNode(); 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