diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-12 19:31:46 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-12 19:31:46 +0300 |
| commit | 733b9e4f99e8a0e7df8157284808a67cd901c4b6 (patch) | |
| tree | eef6d6dbe9ddf73887702bcb31f6b855f12aa36b /source/blender/blenkernel/BKE_global.h | |
| parent | 8f4579affd3809aa7e21a8985b2c45ee2a655695 (diff) | |
| parent | 629d44e0492ac63fda9533d1fba349813a0e49f2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_global.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 78d8271458d..2b670cdf9dd 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -125,13 +125,17 @@ enum { G_DEBUG_DEPSGRAPH_BUILD = (1 << 8), /* depsgraph construction messages */ G_DEBUG_DEPSGRAPH_EVAL = (1 << 9), /* depsgraph evaluation messages */ G_DEBUG_DEPSGRAPH_TAG = (1 << 10), /* depsgraph tagging messages */ - G_DEBUG_DEPSGRAPH_NO_THREADS = (1 << 11), /* single threaded depsgraph */ - G_DEBUG_DEPSGRAPH = (G_DEBUG_DEPSGRAPH_BUILD | G_DEBUG_DEPSGRAPH_EVAL | G_DEBUG_DEPSGRAPH_TAG), - G_DEBUG_SIMDATA = (1 << 12), /* sim debug data display */ - G_DEBUG_GPU_MEM = (1 << 13), /* gpu memory in status bar */ - G_DEBUG_GPU = (1 << 14), /* gpu debug */ + G_DEBUG_DEPSGRAPH_TIME = (1 << 11), /* depsgraph timing statistics and messages */ + G_DEBUG_DEPSGRAPH_NO_THREADS = (1 << 12), /* single threaded depsgraph */ + G_DEBUG_DEPSGRAPH = (G_DEBUG_DEPSGRAPH_BUILD | + G_DEBUG_DEPSGRAPH_EVAL | + G_DEBUG_DEPSGRAPH_TAG | + G_DEBUG_DEPSGRAPH_TIME), + G_DEBUG_SIMDATA = (1 << 13), /* sim debug data display */ + G_DEBUG_GPU_MEM = (1 << 14), /* gpu memory in status bar */ + G_DEBUG_GPU = (1 << 15), /* gpu debug */ G_DEBUG_IO = (1 << 13), /* IO Debugging (for Collada, ...)*/ - G_DEBUG_GPU_SHADERS = (1 << 15), /* GLSL shaders */ + G_DEBUG_GPU_SHADERS = (1 << 16), /* GLSL shaders */ }; #define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \ |