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_app.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_app.c')
| -rw-r--r-- | source/blender/python/intern/bpy_app.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 41de1171aaa..079d5223f58 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -30,6 +30,7 @@ #include <Python.h> #include "bpy_app.h" +#include "bpy_app_handlers.h" #include "bpy_driver.h" #include "BLI_path_util.h" @@ -74,6 +75,9 @@ static PyStructSequence_Field app_info_fields[]= { {(char *)"build_cxxflags", (char *)"C++ compiler flags"}, {(char *)"build_linkflags", (char *)"Binary linking flags"}, {(char *)"build_system", (char *)"Build system used"}, + + /* submodules */ + {(char *)"handlers", (char *)"Application handler callbacks"}, {NULL} }; @@ -140,6 +144,8 @@ static PyObject *make_app_info(void) SetStrItem("Unknown"); #endif + SetObjItem(BPY_app_handlers_struct()); + #undef SetIntItem #undef SetStrItem #undef SetObjItem |