sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

saving globalDict didnt work with python3.x

Browse Source
This commit is contained in:
Campbell Barton 2009-06-15 20:22:50 +00:00
parent 1a7d3a0856
commit 6efd2e6439
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -1986,6 +1986,8 @@ PyObject* initGeometry() {Py_INCREF(Py_None);return Py_None;}
PyObject* initBGL() {Py_INCREF(Py_None);return Py_None;}
#endif
void KX_SetActiveScene(class KX_Scene* scene)
{
gp_KetsjiScene = scene;
@ -2017,11 +2019,17 @@ int saveGamePythonConfig( char **marshal_buffer)
if (pyGlobalDictMarshal) {
// for testing only
// PyObject_Print(pyGlobalDictMarshal, stderr, 0);
char *marshal_cstring;
#if PY_VERSION_HEX < 0x03000000
marshal_cstring = PyString_AsString(pyGlobalDictMarshal);
marshal_length= PyString_Size(pyGlobalDictMarshal);
#else // py3 uses byte arrays
marshal_cstring = PyBytes_AsString(pyGlobalDictMarshal);
marshal_length= PyBytes_Size(pyGlobalDictMarshal);
#endif
*marshal_buffer = new char[marshal_length + 1];
memcpy(*marshal_buffer, PyString_AsString(pyGlobalDictMarshal), marshal_length);
memcpy(*marshal_buffer, marshal_cstring, marshal_length);
Py_DECREF(pyGlobalDictMarshal);
} else {
printf("Error, GameLogic.globalDict could not be marshal'd\n");