- plugins that failed to load are now reported as problems

- some wording fixes in the tutorial
- updated proxyPython to a modified interface
This commit is contained in:
Tannin
2013-08-17 08:49:36 +02:00
parent f494968f45
commit 4b3a2c5fb0
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -1,5 +1,6 @@
#pragma warning( push )
#pragma warning( disable : 4100 ) // a lot of unreferenced formal parameters from boost libraries
#pragma warning( disable : 4996 ) // strncpy claimed to be unsafe
#include "proxypython.h"
@@ -711,7 +712,6 @@ QObject *ProxyPython::instantiate(const QString &pluginName)
bpy::object mobase_module((bpy::handle<>(PyImport_ImportModule("mobase"))));
main_namespace["sys"] = bpy::import("sys");
main_namespace["mobase"] = mobase_module;
QString appendDataPath = QString("sys.path.append(\"%1\")").arg(m_MOInfo->pluginDataPath());
bpy::eval(appendDataPath.toUtf8().constData(), main_namespace);
@@ -736,7 +736,7 @@ QObject *ProxyPython::instantiate(const QString &pluginName)
bool ProxyPython::isPythonInstalled() const
{
return Py_IsInitialized();
return Py_IsInitialized() != 0;
}
+1
View File
@@ -136,6 +136,7 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOr
virtual QString pluginDataPath() const { return this->get_override("pluginDataPath")(); }
virtual void installMod(const QString &fileName) { this->get_override("installMod")(fileName); }
virtual MOBase::IDownloadManager *downloadManager() { return this->get_override("downloadManager")(); }
virtual QString resolvePath(const QString &fileName) const { return this->get_override("resolvePath")(fileName); }
};
struct IDownloadManagerWrapper: MOBase::IDownloadManager, boost::python::wrapper<MOBase::IDownloadManager>