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/blenkernel/BKE_global.h | |
| 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/blenkernel/BKE_global.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 7497a9f04e3..410c8bb3a65 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -120,14 +120,14 @@ typedef struct Global { /* G.debug */ enum { - G_DEBUG = (1 << 0), /* general debug flag, print more info in unexpected cases */ + G_DEBUG = (1 << 0), /* general debug flag, print more info in unexpected cases */ G_DEBUG_FFMPEG = (1 << 1), - G_DEBUG_PYTHON = (1 << 2), /* extra python info */ - G_DEBUG_EVENTS = (1 << 3), /* input/window/screen events */ - G_DEBUG_HANDLERS = (1 << 4), /* events handling */ - G_DEBUG_WM = (1 << 5), /* operator, undo */ - G_DEBUG_JOBS = (1 << 6), /* jobs time profiling */ - G_DEBUG_FREESTYLE = (1 << 7), /* freestyle messages */ + G_DEBUG_PYTHON = (1 << 2), /* extra python info */ + G_DEBUG_EVENTS = (1 << 3), /* input/window/screen events */ + G_DEBUG_HANDLERS = (1 << 4), /* events handling */ + 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_BUILD = (1 << 8), /* depsgraph construction messages */ G_DEBUG_DEPSGRAPH_EVAL = (1 << 9), /* depsgraph evaluation messages */ G_DEBUG_DEPSGRAPH_TAG = (1 << 10), /* depsgraph tagging messages */ @@ -138,11 +138,11 @@ enum { G_DEBUG_DEPSGRAPH_EVAL | G_DEBUG_DEPSGRAPH_TAG | G_DEBUG_DEPSGRAPH_TIME), - G_DEBUG_SIMDATA = (1 << 14), /* sim debug data display */ - G_DEBUG_GPU_MEM = (1 << 15), /* gpu memory in status bar */ - G_DEBUG_GPU = (1 << 16), /* gpu debug */ - G_DEBUG_IO = (1 << 17), /* IO Debugging (for Collada, ...)*/ - G_DEBUG_GPU_SHADERS = (1 << 18), /* GLSL shaders */ + G_DEBUG_SIMDATA = (1 << 14), /* sim debug data display */ + G_DEBUG_GPU_MEM = (1 << 15), /* gpu memory in status bar */ + G_DEBUG_GPU = (1 << 16), /* gpu debug */ + G_DEBUG_IO = (1 << 17), /* IO Debugging (for Collada, ...)*/ + G_DEBUG_GPU_SHADERS = (1 << 18), /* GLSL shaders */ }; #define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \ |