- the download manager now registers download speed. Right now this is only used

to display an average speed on the settings menu
- added a python27.dll compiled with vc100. This can now be bundled without introducing more dependencies
- bugfix: extracting now stops after an error
- bugfix: the way hook.dll caused CREATE_ALWAYS/CREATE_NEW to always write into overwrite could lead to the
file being created when the call should have failed (because the file existed and was protected)
- bugfix: GetPrivateProfileString does NOT properly report files as missing. This means that
the ini-query optimization could optimize away requests that should work
- bugfix: fomod installer couldn't display images because they were unpacked to the wrong temporary location
- bugfix: When disabling local saves and choosing to delete the saves nothing happened
- bugfix: the python plugin couldn't find the pyqt libraries
This commit is contained in:
Tannin
2013-08-30 20:59:12 +02:00
parent 4b3a2c5fb0
commit f231c9a025
+3 -2
View File
@@ -20,6 +20,7 @@
// sip and qt slots seems to conflict
#include <sip.h>
using namespace MOBase;
namespace bpy = boost::python;
@@ -659,7 +660,7 @@ QString ProxyPython::description() const
VersionInfo ProxyPython::version() const
{
return VersionInfo(1, 0, 1, VersionInfo::RELEASE_FINAL);
return VersionInfo(1, 0, 2, VersionInfo::RELEASE_FINAL);
}
bool ProxyPython::isActive() const
@@ -712,7 +713,7 @@ 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());
QString appendDataPath = QString("sys.path.insert(0, \"%1\")").arg(m_MOInfo->pluginDataPath());
bpy::eval(appendDataPath.toUtf8().constData(), main_namespace);