diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-17 17:50:09 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-10-17 17:50:36 +0300 |
| commit | d31ea3b89aa8d583a6d089f96dff46c0759f8c8a (patch) | |
| tree | 9d24890a0d783b907b8064ec3643a001d0a91048 /source/blender/python/intern/bpy_app.c | |
| parent | 938aa52313bba9bd001ea3e9a697658d12e3308e (diff) | |
| parent | 5f8222501c2267ae82829ccf6f6df295a8b8ec55 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_global.h
source/blender/editors/undo/ed_undo.c
Diffstat (limited to 'source/blender/python/intern/bpy_app.c')
| -rw-r--r-- | source/blender/python/intern/bpy_app.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index dde647793b0..3aad4dcde34 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -374,6 +374,7 @@ static PyGetSetDef bpy_app_getsets[] = { {(char *)"debug_depsgraph_pretty", bpy_app_debug_get, bpy_app_debug_set, (char *)bpy_app_debug_doc, (void *)G_DEBUG_DEPSGRAPH_PRETTY}, {(char *)"debug_simdata", bpy_app_debug_get, bpy_app_debug_set, (char *)bpy_app_debug_doc, (void *)G_DEBUG_SIMDATA}, {(char *)"debug_gpumem", bpy_app_debug_get, bpy_app_debug_set, (char *)bpy_app_debug_doc, (void *)G_DEBUG_GPU_MEM}, + {(char *)"debug_io", bpy_app_debug_get, bpy_app_debug_set, (char *)bpy_app_debug_doc, (void *)G_DEBUG_IO}, {(char *)"binary_path_python", bpy_app_binary_path_python_get, NULL, (char *)bpy_app_binary_path_python_doc, NULL}, |