Skip to content
Snippets Groups Projects
Commit 92be8015 authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot
Browse files

Merge topic 'plug-an-valueindexed-material-memleak' into release


7e6648f6 plug a bad memory leak with value indexed materials

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarMichael Migliore <michael.migliore@kitware.com>
Merge-request: !6553
parents 360e6b32 7e6648f6
No related branches found
No related tags found
No related merge requests found
......@@ -306,6 +306,7 @@ OSPMaterial vtkOSPRayMaterialHelpers::MakeMaterial(
vtkImageData* vColorTextureMap = vtkImageData::SafeDownCast(texname->GetInput());
OSPTexture t2d = vtkOSPRayMaterialHelpers::VTKToOSPTexture(backend, vColorTextureMap);
ospSetObject(oMaterial, param.first.c_str(), static_cast<OSPTexture>(t2d));
ospRelease(t2d);
}
}
break;
......
......@@ -629,7 +629,8 @@ OSPMaterial MakeActorMaterial(vtkOSPRayRendererNode* orn, OSPRenderer oRenderer,
{
if (std::string("Value Indexed") == property->GetMaterialName())
{
vtkOSPRayMaterialHelpers::MakeMaterials(orn, oRenderer, mats);
vtkOSPRayMaterialHelpers::MakeMaterials(
orn, oRenderer, mats); // todo: do an mtime check to avoid doing this when unchanged
std::string requested_mat_name = materialName;
if (requested_mat_name != "" && requested_mat_name != "Value Indexed")
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment