diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
| commit | d65ebf8c847c18f8be568eab4d5c65e7b630a40f (patch) | |
| tree | 2795070d936c6ec7012a0339ea74d1d4b317c3d4 /source/blender/python/intern/bpy.c | |
| parent | 17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47 (diff) | |
| parent | a03707d408b9e37cd11124c93b1516eae9522139 (diff) | |
Merged changes in the trunk up to revision 37799.
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies. Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
Diffstat (limited to 'source/blender/python/intern/bpy.c')
| -rw-r--r-- | source/blender/python/intern/bpy.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index ce548af3780..fb94b827dea 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -60,8 +60,6 @@ #include "../generic/blf_py_api.h" #include "../generic/IDProp.h" -#include "AUD_PyInit.h" - #include "BPy_Freestyle.h" PyObject *bpy_package_py= NULL; |