Merge remote-tracking branch 'remotes/origin/master' into SolveSpace

[modules/shaper.git] / src / Model / Model_PluginManager.cpp

diff --git a/src/Model/Model_PluginManager.cpp b/src/Model/Model_PluginManager.cpp
index 2750614e7555e98a25bd973d215fb266ed39f5df..cbb917a76fa9a7238bbd401865464e239cc4fba0 100644 (file)
--- a/src/Model/Model_PluginManager.cpp
+++ b/src/Model/Model_PluginManager.cpp
@@ -25,7 +25,7 @@ boost::shared_ptr<ModelAPI_Feature> Model_PluginManager::createFeature(string th
     myCurrentPluginName = myPlugins[theFeatureID];
     if (myPluginObjs.find(myCurrentPluginName) == myPluginObjs.end()) {
       // load plugin library if not yet done
-      loadLibrary(myCurrentPluginName);
+      Config_ModuleReader::loadLibrary(myCurrentPluginName);
     }
     if (myPluginObjs.find(myCurrentPluginName) != myPluginObjs.end()) {
       boost::shared_ptr<ModelAPI_Feature> aCreated = 
@@ -93,7 +93,6 @@ void Model_PluginManager::LoadPluginsInfo()
 
   // Read plugins information from XML files
   Config_ModuleReader aXMLReader("FeatureRegisterEvent");
-  aXMLReader.setAutoImport(true);
   aXMLReader.readAll();
 }