Commit 9f0addc8 authored by Ken Martin's avatar Ken Martin

update ParaView to use the new picking changes in VTK

as paraview uses iceT and some synchronized render
and hardware selector subclasses we have to make some changes
in PV to reflect the changes made in VTK MR

vtk/vtk!4339
parent 5bba1bd4
......@@ -15,7 +15,6 @@
=========================================================================*/
#include "vtkPVClientServerSynchronizedRenderers.h"
#include "vtkHardwareSelector.h"
#include "vtkLZ4Compressor.h"
#include "vtkMultiProcessController.h"
#include "vtkObjectFactory.h"
......@@ -250,12 +249,6 @@ void vtkPVClientServerSynchronizedRenderers::PushImageToScreen()
}
this->Superclass::PushImageToScreen();
this->Renderer->SetPreserveColorBuffer(prev);
vtkHardwareSelector* sel = this->Renderer->GetSelector();
if (sel)
{
sel->SavePixelBuffer(sel->GetCurrentPass());
}
}
//----------------------------------------------------------------------------
......
......@@ -693,17 +693,20 @@ void vtkIceTCompositePass::Draw(const vtkRenderState* render_state, const IceTDo
{
// copy the processed selection buffers into icet
unsigned char* passdata = sel->GetPixelBuffer(sel->GetCurrentPass());
unsigned int* area = sel->GetArea();
unsigned int passwidth = area[2] - area[0] + 1;
for (int y = 0; y < icetImageGetHeight(result); ++y)
if (passdata)
{
for (int x = 0; x < icetImageGetWidth(result); ++x)
unsigned int* area = sel->GetArea();
unsigned int passwidth = area[2] - area[0] + 1;
for (int y = 0; y < icetImageGetHeight(result); ++y)
{
unsigned char* pdptr = passdata + (y * passwidth + x) * 3;
destdata[0] = pdptr[0];
destdata[1] = pdptr[1];
destdata[2] = pdptr[2];
destdata += 4;
for (int x = 0; x < icetImageGetWidth(result); ++x)
{
unsigned char* pdptr = passdata + (y * passwidth + x) * 3;
destdata[0] = pdptr[0];
destdata[1] = pdptr[1];
destdata[2] = pdptr[2];
destdata += 4;
}
}
}
}
......
Subproject commit 6edfd72d7c33dcc605e283c9c31fa04b9c2e2544
Subproject commit 23ec83e4f681ce14e19f7bdbbcf61905cbf97717
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