Commit 5a3ca855 authored by Allison Vacanti's avatar Allison Vacanti Committed by Kitware Robot

Merge topic 'slicer4609_ROI_face_opacity'

561cf61b Pass property keys to child actors in BoxRepr.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ken Martin's avatarKen Martin <ken.martin@kitware.com>
Merge-request: !4683
parents 40645e5c 561cf61b
......@@ -1489,6 +1489,10 @@ int vtkBoxRepresentation::RenderOpaqueGeometry(vtkViewport *v)
int count=0;
this->BuildRepresentation();
this->HexActor->SetPropertyKeys(this->GetPropertyKeys());
this->HexOutline->SetPropertyKeys(this->GetPropertyKeys());
this->HexFace->SetPropertyKeys(this->GetPropertyKeys());
count += this->HexActor->RenderOpaqueGeometry(v);
count += this->HexOutline->RenderOpaqueGeometry(v);
count += this->HexFace->RenderOpaqueGeometry(v);
......@@ -1496,6 +1500,7 @@ int vtkBoxRepresentation::RenderOpaqueGeometry(vtkViewport *v)
{
if(this->Handle[j]->GetVisibility())
{
this->Handle[j]->SetPropertyKeys(this->GetPropertyKeys());
count += this->Handle[j]->RenderOpaqueGeometry(v);
}
}
......@@ -1509,6 +1514,10 @@ int vtkBoxRepresentation::RenderTranslucentPolygonalGeometry(vtkViewport *v)
int count=0;
this->BuildRepresentation();
this->HexActor->SetPropertyKeys(this->GetPropertyKeys());
this->HexOutline->SetPropertyKeys(this->GetPropertyKeys());
this->HexFace->SetPropertyKeys(this->GetPropertyKeys());
count += this->HexActor->RenderTranslucentPolygonalGeometry(v);
count += this->HexOutline->RenderTranslucentPolygonalGeometry(v);
count += this->HexFace->RenderTranslucentPolygonalGeometry(v);
......@@ -1517,6 +1526,7 @@ int vtkBoxRepresentation::RenderTranslucentPolygonalGeometry(vtkViewport *v)
{
if(this->Handle[j]->GetVisibility())
{
this->Handle[j]->SetPropertyKeys(this->GetPropertyKeys());
count += this->Handle[j]->RenderTranslucentPolygonalGeometry(v);
}
}
......
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