Commit cde761b4 authored by Ken Martin's avatar Ken Martin
Browse files

merge from the main tree

parent f1c584f1
......@@ -37,7 +37,7 @@
#include <ctype.h>
vtkCxxRevisionMacro(vtkPVXMLPackageParser, "1.35.2.1");
vtkCxxRevisionMacro(vtkPVXMLPackageParser, "1.35.2.2");
vtkStandardNewMacro(vtkPVXMLPackageParser);
#ifndef VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION
......@@ -171,6 +171,21 @@ void vtkPVXMLPackageParser::ProcessConfiguration()
// Loop over the top-level elements.
unsigned int i;
// First server manager files
for(i=0; i < root->GetNumberOfNestedElements(); ++i)
{
vtkPVXMLElement* element = root->GetNestedElement(i);
const char* name = element->GetName();
if(strcmp(name, "ServerManagerFile") == 0)
{
this->LoadServerManagerFile(element);
}
}
// Instantiate new server manager prototypes
// These are used by the modules
vtkSMProxyManager* proxm = vtkSMObject::GetProxyManager();
proxm->InstantiateGroupPrototypes("filters");
for(i=0; i < root->GetNumberOfNestedElements(); ++i)
{
vtkPVXMLElement* element = root->GetNestedElement(i);
......@@ -218,10 +233,6 @@ void vtkPVXMLPackageParser::ProcessConfiguration()
{
this->CreateWriter(element);
}
else if(strcmp(name, "ServerManagerFile") == 0)
{
this->LoadServerManagerFile(element);
}
else if(strcmp(name, "Library") == 0)
{
if(!this->LoadLibrary(element))
......
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