Commit 527a5a6a authored by Ken Martin's avatar Ken Martin
Browse files

BUG: merges from the main tree

parent e41c7266
......@@ -27,7 +27,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVDeskTopRenderModule);
vtkCxxRevisionMacro(vtkPVDeskTopRenderModule, "1.3");
vtkCxxRevisionMacro(vtkPVDeskTopRenderModule, "1.3.2.1");
......@@ -168,7 +168,7 @@ void vtkPVDeskTopRenderModule::SetProcessModule(vtkProcessModule *pm)
// Even a cast to vtkPVClientServerModule would be better than this.
// How can we syncronize the process modules and render modules?
stream << vtkClientServerStream::Invoke << pvm->GetProcessModuleID()
<< "GetSocketController"
<< "GetRenderServerSocketController"
<< vtkClientServerStream::End;
stream << vtkClientServerStream::Invoke << this->CompositeID
<< "SetController" << vtkClientServerStream::LastResult
......
......@@ -20,15 +20,15 @@
#ifndef __vtkPVIceTRenderModule_h
#define __vtkPVIceTRenderModule_h
#include "vtkPVCompositeRenderModule.h"
#include "vtkPVMultiDisplayRenderModule.h"
class vtkCompositeRenderManager;
class VTK_EXPORT vtkPVIceTRenderModule : public vtkPVCompositeRenderModule
class VTK_EXPORT vtkPVIceTRenderModule : public vtkPVMultiDisplayRenderModule
{
public:
static vtkPVIceTRenderModule* New();
vtkTypeRevisionMacro(vtkPVIceTRenderModule,vtkPVCompositeRenderModule);
vtkTypeRevisionMacro(vtkPVIceTRenderModule,vtkPVMultiDisplayRenderModule);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......
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