Commit 1708ed8f authored by Ken Martin's avatar Ken Martin
Browse files

ENH: bug fixes from the main tree

parent da187e9e
......@@ -138,7 +138,7 @@ public:
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkPVRenderView);
vtkCxxRevisionMacro(vtkPVRenderView, "1.343.2.1");
vtkCxxRevisionMacro(vtkPVRenderView, "1.343.2.2");
int vtkPVRenderViewCommand(ClientData cd, Tcl_Interp *interp,
int argc, char *argv[]);
......@@ -1687,8 +1687,19 @@ void vtkPVRenderView::EventuallyRenderCallBack()
}
vtkPVApplication *pvApp = this->GetPVApplication();
pvApp->GetProcessModule()->SetGlobalLODFlag(0);
pvApp->GetProcessModule()->GetRenderModule()->StillRender();
if (pvApp)
{
vtkPVProcessModule *pm = pvApp->GetProcessModule();
if (pm)
{
pm->SetGlobalLODFlag(0);
vtkPVRenderModule* rm = pm->GetRenderModule();
if (rm)
{
rm->StillRender();
}
}
}
}
//----------------------------------------------------------------------------
......
......@@ -67,7 +67,7 @@
vtkStandardNewMacro(vtkPVSource);
vtkCxxRevisionMacro(vtkPVSource, "1.395");
vtkCxxRevisionMacro(vtkPVSource, "1.395.2.1");
vtkCxxSetObjectMacro(vtkPVSource,Notebook,vtkPVSourceNotebook);
vtkCxxSetObjectMacro(vtkPVSource,PartDisplay,vtkSMPartDisplay);
......@@ -1859,9 +1859,8 @@ void vtkPVSource::SaveState(ofstream *file)
<< "[$kw(" << this->GetPVWindow()->GetTclName() << ") "
<< "CreatePVSource " << this->GetModuleName() << "]" << endl;
// Call accept.
*file << "$kw(" << this->GetTclName() << ") SetLabel "
<< this->GetLabel() << endl;
*file << "$kw(" << this->GetTclName() << ") SetLabel {"
<< this->GetLabel() << "}" << endl;
// Let the PVWidgets set up the object.
numWidgets = this->Widgets->GetNumberOfItems();
......
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