diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 14:48:15 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 14:48:15 +0400 |
| commit | 1c0bdad8354139593cecb7cbbe3de27d8c5f6017 (patch) | |
| tree | 82fada8c6425a9cd8194d0ac06b91981c7b5087a /source/blender/python | |
| parent | 9b7b8464b9b09f4ca74e40624d3d6c8dffb0247e (diff) | |
| parent | 226ff0d4da13ac66991f1708251faa5dff3f7dea (diff) | |
svn merge -r40222:40344 ^/trunk/blender
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/intern/bpy_app_handlers.c | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/gpu.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c index eeb2adb3cf2..5dcaf9e5423 100644 --- a/source/blender/python/intern/bpy_app_handlers.c +++ b/source/blender/python/intern/bpy_app_handlers.c @@ -63,7 +63,7 @@ static PyStructSequence_Desc app_cb_info_desc= { #endif */ -static PyObject *py_cb_array[BLI_CB_EVT_TOT]= {0}; +static PyObject *py_cb_array[BLI_CB_EVT_TOT]= {NULL}; static PyObject *make_app_cb_info(void) { @@ -102,7 +102,7 @@ PyObject *BPY_app_handlers_struct(void) /* assign the C callbacks */ if(ret) { - static bCallbackFuncStore funcstore_array[BLI_CB_EVT_TOT]= {{0}}; + static bCallbackFuncStore funcstore_array[BLI_CB_EVT_TOT]= {{NULL}}; bCallbackFuncStore *funcstore; int pos= 0; diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c index 334bb1f725a..8fa6a7b0629 100644 --- a/source/blender/python/intern/gpu.c +++ b/source/blender/python/intern/gpu.c @@ -55,6 +55,8 @@ #include "bpy_rna.h" +#include "gpu.h" + #define PY_MODULE_ADD_CONSTANT(module, name) PyModule_AddIntConstant(module, #name, name) PyDoc_STRVAR(M_gpu_doc, |