Use OB code if GPL plugins are used. Otherwise scripts & obmm

Signed-off-by: Geoff Hutchison <[email protected]>

avogadro/qtplugins/forcefield/forcefield.cpp

@@ -67,17 +67,21 @@ Forcefield::Forcefield(QObject* parent_)
 
   // add the openbabel calculators in case they don't exist
 #ifdef BUILD_GPL_PLUGINS
+  // These directly use Open Babel and are fast
   Calc::EnergyManager::registerModel(new OBEnergy("MMFF94"));
   Calc::EnergyManager::registerModel(new OBEnergy("UFF"));
   Calc::EnergyManager::registerModel(new OBEnergy("GAFF"));
-#else
+#endif
+
+  refreshScripts();
+
+#ifndef BUILD_GPL_PLUGINS
+  // These call obmm and can be slow
   Calc::EnergyManager::registerModel(new OBMMEnergy("MMFF94"));
   Calc::EnergyManager::registerModel(new OBMMEnergy("UFF"));
   Calc::EnergyManager::registerModel(new OBMMEnergy("GAFF"));
 #endif
 
-  refreshScripts();
-
   QAction* action = new QAction(this);
   action->setEnabled(true);
   action->setText(tr("Optimize Geometry"));