diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 15:41:07 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-08-16 15:41:07 +0400 |
| commit | 25fec1592efade86233c0ba71212dc973b618ad1 (patch) | |
| tree | 8c6eccaf24d7bf4fa72c5cfc1ca86511d2df0c9d /source/blender/python/intern/bpy.c | |
| parent | a91d538f47171a40463016b91c22d39d694d923a (diff) | |
| parent | 2b7a774ab0dfd3bc66240b387a586b5122ab2661 (diff) | |
Audaspace (GSoC): First merging commit
* All audaspace changes from the GSoC branch including the aud Python module
* This commit also includes some minor changes in source/gameengine/Ketsji/KX_PythonInit.cpp:
- Fixing names of some constants
- removing outdated stopDSP() python function
- Autoinclusion of bge instead of GameLogic
- Fix for some error messages: GameLogic -> bge.logic
Diffstat (limited to 'source/blender/python/intern/bpy.c')
| -rw-r--r-- | source/blender/python/intern/bpy.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index c86ebc7f691..e107509d844 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -41,6 +41,11 @@ #include "../generic/blf_api.h" #include "../generic/IDProp.h" +#ifndef DISABLE_PYTHON +#define WITH_PYTHON +#endif +#include "AUD_C-API.h" + static char bpy_script_paths_doc[] = ".. function:: script_paths()\n" "\n" @@ -153,7 +158,7 @@ void BPy_init_modules( void ) BGL_Init(); BLF_Init(); IDProp_Init_Types(); - + AUD_initPython(); mod = PyModule_New("_bpy"); |