Commit a4fb5596 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

BUG #13427. Fix issues with loading plugins in PV_PLUGIN_PATH.

Ensure that the plugins in PV_PLUGIN_PATH are loaded after ParaView has been
initialized.
parent f3acf177
......@@ -200,12 +200,6 @@ vtkPVPluginTracker* vtkPVPluginTracker::GetInstance()
vtkPVPluginTrackerDebugMacro(
"Could not find .plugins file for distributed plugins");
}
// Now load any plugins located in the PV_PLUGIN_PATH environment variable.
// These are always loaded (not merely located).
vtkPVPluginLoader* loader = vtkPVPluginLoader::New();
loader->LoadPluginsFromPluginSearchPath();
loader->Delete();
}
return Instance;
......
......@@ -13,13 +13,16 @@ PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkInitializationHelper.h"
#include "vtkPVConfig.h"
#include "vtkPVInitializer.h"
#include "vtkClientServerInterpreter.h"
#include "vtkClientServerInterpreterInitializer.h"
#include "vtkNew.h"
#include "vtkOutputWindow.h"
#include "vtkProcessModule.h"
#include "vtkPVConfig.h"
#include "vtkPVInitializer.h"
#include "vtkPVOptions.h"
#include "vtkPVPluginLoader.h"
#include "vtkSmartPointer.h"
#include "vtkSMMessage.h"
#include "vtkSMProperty.h"
......@@ -120,6 +123,11 @@ void vtkInitializationHelper::Initialize(int argc, char**argv,
// Make sure the ProxyManager get created...
vtkSMProxyManager::GetProxyManager();
// Now load any plugins located in the PV_PLUGIN_PATH environment variable.
// These are always loaded (not merely located).
vtkNew<vtkPVPluginLoader> loader;
loader->LoadPluginsFromPluginSearchPath();
}
//----------------------------------------------------------------------------
......
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