diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-21 12:51:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-21 12:51:58 +0300 |
| commit | d4ee0cee51e01cf62acc1e239844fcb6c7dbf449 (patch) | |
| tree | eefa73fcc2fcf614707d409c4c8571f268afdeef /source/blender/blenkernel/BKE_global.h | |
| parent | bfa51b1b0c705780bccbf551e81baa5846fd6a85 (diff) | |
| parent | fe1a508e551bc8309f552d69da0b74f7f5f5d46f (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 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 80a8f750d20..78d8271458d 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -122,13 +122,16 @@ enum { G_DEBUG_WM = (1 << 5), /* operator, undo */ G_DEBUG_JOBS = (1 << 6), /* jobs time profiling */ G_DEBUG_FREESTYLE = (1 << 7), /* freestyle messages */ - G_DEBUG_DEPSGRAPH = (1 << 8), /* depsgraph messages */ - G_DEBUG_SIMDATA = (1 << 9), /* sim debug data display */ - G_DEBUG_GPU_MEM = (1 << 10), /* gpu memory in status bar */ + 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_GPU = (1 << 12), /* gpu debug */ + 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_IO = (1 << 13), /* IO Debugging (for Collada, ...)*/ - G_DEBUG_GPU_SHADERS = (1 << 14), /* GLSL shaders */ + G_DEBUG_GPU_SHADERS = (1 << 15), /* GLSL shaders */ }; #define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \ |