Commit 5158a4ce authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot

Merge topic 'indexed_color_fix'

a05cdfa8 With indexed string data we never shoudl use textures
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !768
parents 091964b2 a05cdfa8
......@@ -282,6 +282,13 @@ int vtkMapper::CanUseTextureMapForColoring(vtkDataObject* input)
return 0; // user doesn't want us to use texture maps at all.
}
// index color does not use textures
if (this->LookupTable &&
this->LookupTable->GetIndexedLookup())
{
return 0;
}
if (input->IsA("vtkDataSet"))
{
int cellFlag=0;
......@@ -311,12 +318,6 @@ int vtkMapper::CanUseTextureMapForColoring(vtkDataObject* input)
}
}
if (this->LookupTable &&
this->LookupTable->GetIndexedLookup())
{
return 0;
}
return 1;
}
......
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