diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-08 09:45:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-08 09:45:16 +0400 |
| commit | 19d0f93099b0964fca66c4f4b1651260b749a73d (patch) | |
| tree | dbc9dabdc2e87dba0d35d0a947b70abb5f07af08 /source/gameengine | |
| parent | 873fe5cb59deac0918135e2226c6d2b3cbc743ef (diff) | |
| parent | 054e10ac135eee0eb6d4a0e3ca5a3e8ae5a94cea (diff) | |
svn merge ^/trunk/blender -r43934:43976
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_PythonInit.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp index 82084700d6c..401474b21a9 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.cpp +++ b/source/gameengine/Ketsji/KX_PythonInit.cpp @@ -1880,6 +1880,14 @@ PyObject* initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur Py_DECREF(mod); } +#ifdef WITH_AUDASPACE + /* accessing a SoundActuator's sound results in a crash if aud is not initialised... */ + { + PyObject *mod= PyImport_ImportModuleLevel((char *)"aud", NULL, NULL, NULL, 0); + Py_DECREF(mod); + } +#endif + initPyTypes(); bpy_import_main_set(maggie); @@ -1924,6 +1932,14 @@ PyObject* initGamePythonScripting(const STR_String& progname, TPythonSecurityLev Py_NoSiteFlag=1; Py_FrozenFlag=1; +#ifdef WITH_AUDASPACE + /* accessing a SoundActuator's sound results in a crash if aud is not initialised... */ + { + PyObject *mod= PyImport_ImportModuleLevel((char *)"aud", NULL, NULL, NULL, 0); + Py_DECREF(mod); + } +#endif + initPyTypes(); bpy_import_main_set(maggie); |