Commit 2047a24f authored by Kenneth Moreland's avatar Kenneth Moreland

BUG: vtkParallelRenderManager should let subclasses do post processing even...

BUG: vtkParallelRenderManager should let subclasses do post processing even when UseCompositing flag is off.
parent 019916af
......@@ -23,7 +23,7 @@
#include "vtkTimerLog.h"
#include "vtkUnsignedCharArray.h"
vtkCxxRevisionMacro(vtkCompositeRenderManager, "1.8");
vtkCxxRevisionMacro(vtkCompositeRenderManager, "1.9");
vtkStandardNewMacro(vtkCompositeRenderManager);
vtkCxxSetObjectMacro(vtkCompositeRenderManager, Compositer, vtkCompositer);
......@@ -74,6 +74,11 @@ void vtkCompositeRenderManager::PreRenderProcessing()
//----------------------------------------------------------------------------
void vtkCompositeRenderManager::PostRenderProcessing()
{
if (!this->UseCompositing || this->CheckForAbortComposite())
{
return;
}
if (this->Controller->GetNumberOfProcesses() > 1)
{
// Read in data.
......
......@@ -70,7 +70,7 @@ const int vtkParallelRenderManager::REN_INFO_DOUBLE_SIZE =
const int vtkParallelRenderManager::LIGHT_INFO_DOUBLE_SIZE =
sizeof(vtkParallelRenderManager::LightInfoDouble)/sizeof(double);
vtkCxxRevisionMacro(vtkParallelRenderManager, "1.58");
vtkCxxRevisionMacro(vtkParallelRenderManager, "1.59");
//----------------------------------------------------------------------------
vtkParallelRenderManager::vtkParallelRenderManager()
......@@ -683,18 +683,20 @@ void vtkParallelRenderManager::EndRender()
this->RenderTime = this->Timer->GetElapsedTime();
this->ImageProcessingTime = 0;
if (!this->UseCompositing)
{
this->Lock = 0;
return;
}
// EndRender only happens on root.
if (this->CheckForAbortComposite())
{
this->Lock = 0;
return;
}
// Just because we are not doing compositing does not mean a subclass
// does not need to do post render processing.
// if (!this->UseCompositing)
// {
// this->Lock = 0;
// return;
// }
// // EndRender only happens on root.
// if (this->CheckForAbortComposite())
// {
// this->Lock = 0;
// return;
// }
this->PostRenderProcessing();
......@@ -733,10 +735,12 @@ void vtkParallelRenderManager::SatelliteEndRender()
// {
// return;
// }
if (!this->UseCompositing)
{
return;
}
// Just because we are not doing compositing does not mean a subclass
// does not need to do post render processing.
// if (!this->UseCompositing)
// {
// return;
// }
this->PostRenderProcessing();
......
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