Commit e5bd00b9 authored by Dean Inglis's avatar Dean Inglis
Browse files

BUG: RenderOpaqueGeometry and RenderOverlay will fail to render the label...

BUG: RenderOpaqueGeometry and RenderOverlay will fail to render the label mapper's input when AutoLabel is on and Label is NULL
parent 69af376a
......@@ -25,7 +25,7 @@
#include "vtkObjectFactory.h"
#include "vtkMath.h"
vtkCxxRevisionMacro(vtkLeaderActor2D, "1.10");
vtkCxxRevisionMacro(vtkLeaderActor2D, "1.11");
vtkStandardNewMacro(vtkLeaderActor2D);
vtkCxxSetObjectMacro(vtkLeaderActor2D,LabelTextProperty,vtkTextProperty);
......@@ -634,12 +634,13 @@ int vtkLeaderActor2D::RenderOpaqueGeometry(vtkViewport *viewport)
this->BuildLeader(viewport);
// Everything is built, just have to render
if ( this->Label != NULL && this->Label[0] )
if ( (this->Label != NULL && this->Label[0]) || \
(this->AutoLabel && this->LabelMapper->GetInput() != NULL ) )
{
renderedSomething += this->LabelActor->RenderOpaqueGeometry(viewport);
}
renderedSomething += this->LeaderActor->RenderOpaqueGeometry(viewport);
return renderedSomething;
}
......@@ -650,9 +651,10 @@ int vtkLeaderActor2D::RenderOverlay(vtkViewport *viewport)
{
int renderedSomething=0;
this->BuildLeader(viewport);
// Everything is built, just have to render
if ( this->Label != NULL && this->Label[0] )
if ( (this->Label != NULL && this->Label[0]) || \
(this->AutoLabel && this->LabelMapper->GetInput() != NULL ) )
{
renderedSomething += this->LabelActor->RenderOverlay(viewport);
}
......
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