Commit 0c29a735 authored by Ken Martin's avatar Ken Martin Committed by Code Review

Merge topic 'depth_peeling_fix' into master

4693f392 A couple depth peeling fixes
parents b677b418 4693f392
......@@ -1222,6 +1222,16 @@ void vtkImplicitPlaneRepresentation::BuildRepresentation()
return;
}
vtkInformation *info = this->GetPropertyKeys();
this->OutlineActor->SetPropertyKeys(info);
this->CutActor->SetPropertyKeys(info);
this->EdgesActor->SetPropertyKeys(info);
this->ConeActor->SetPropertyKeys(info);
this->LineActor->SetPropertyKeys(info);
this->ConeActor2->SetPropertyKeys(info);
this->LineActor2->SetPropertyKeys(info);
this->SphereActor->SetPropertyKeys(info);
if ( this->GetMTime() > this->BuildTime ||
this->Plane->GetMTime() > this->BuildTime )
{
......
......@@ -495,6 +495,16 @@ void vtkDepthPeelingPass::Render(const vtkRenderState *s)
// restore blending
glEnable(GL_BLEND);
c = s->GetPropArrayCount();
for (i = 0; i < c; i++)
{
vtkProp *p=s->GetPropArray()[i];
vtkInformation *info = p->GetPropertyKeys();
info->Remove(vtkDepthPeelingPass::OpaqueZTextureUnit());
info->Remove(vtkDepthPeelingPass::TranslucentZTextureUnit());
info->Remove(vtkDepthPeelingPass::DestinationSize());
}
this->NumberOfRenderedProps = this->TranslucentPass->GetNumberOfRenderedProps();
vtkOpenGLCheckErrorMacro("failed after Render");
......
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