Commit 2b2a8466 authored by Ken Martin's avatar Ken Martin
Browse files

merge from main tree

parent f37c7f50
......@@ -18,7 +18,7 @@
#include "vtkLookupTable.h"
#include "vtkMath.h"
vtkCxxRevisionMacro(vtkMapper, "1.107");
vtkCxxRevisionMacro(vtkMapper, "1.107.2.1");
// Initialize static member that controls global immediate mode rendering
static int vtkMapperGlobalImmediateModeRendering = 0;
......@@ -219,7 +219,7 @@ vtkUnsignedCharArray *vtkMapper::MapScalars(double alpha)
GetScalars(this->GetInput(), this->ScalarMode, this->ArrayAccessMode,
this->ArrayId, this->ArrayName, this->ArrayComponent);
if (this->GetMTime() < this->Colors->GetMTime() &&
scalars->GetMTime() < this->Colors->GetMTime())
scalars && scalars->GetMTime() < this->Colors->GetMTime())
{
return this->Colors;
}
......
Supports Markdown
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