diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_global.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index a7aa4c6969a..865f621e82d 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -45,7 +45,6 @@ extern "C" { /* forwards */ struct Main; -struct Object; typedef struct Global { @@ -70,7 +69,6 @@ typedef struct Global { bool factory_startup; short moving; - short winpos, displaymode; /* used to be in Render */ /* to indicate render is busy, prevent renderwindow events etc */ bool is_rendering; @@ -90,9 +88,6 @@ typedef struct Global { /* this variable is written to / read from FileGlobal->fileflags */ int fileflags; - /* save the allowed windowstate of blender when using -W or -w (GHOST_TWindowState) */ - int windowstate; - /* message to use when autoexec fails */ char autoexec_fail[200]; } Global; @@ -130,10 +125,14 @@ enum { 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_NO_THREADS = (1 << 11), /* sinle threaded depsgraph */ + G_DEBUG_GPU = (1 << 12), /* gpu debug */ }; #define G_DEBUG_ALL (G_DEBUG | G_DEBUG_FFMPEG | G_DEBUG_PYTHON | G_DEBUG_EVENTS | G_DEBUG_WM | G_DEBUG_JOBS | \ - G_DEBUG_FREESTYLE | G_DEBUG_DEPSGRAPH) + G_DEBUG_FREESTYLE | G_DEBUG_DEPSGRAPH | G_DEBUG_GPU_MEM) /* G.fileflags */ @@ -141,14 +140,19 @@ enum { #define G_AUTOPACK (1 << 0) #define G_FILE_COMPRESS (1 << 1) #define G_FILE_AUTOPLAY (1 << 2) + +#ifdef DNA_DEPRECATED_ALLOW #define G_FILE_ENABLE_ALL_FRAMES (1 << 3) /* deprecated */ #define G_FILE_SHOW_DEBUG_PROPS (1 << 4) /* deprecated */ #define G_FILE_SHOW_FRAMERATE (1 << 5) /* deprecated */ /* #define G_FILE_SHOW_PROFILE (1 << 6) */ /* deprecated */ -#define G_FILE_LOCK (1 << 7) -#define G_FILE_SIGN (1 << 8) +/* #define G_FILE_LOCK (1 << 7) */ /* deprecated */ +/* #define G_FILE_SIGN (1 << 8) */ /* deprecated */ +#endif /* DNA_DEPRECATED_ALLOW */ + #define G_FILE_USERPREFS (1 << 9) #define G_FILE_NO_UI (1 << 10) +#ifdef DNA_DEPRECATED_ALLOW /* #define G_FILE_GAME_TO_IPO (1 << 11) */ /* deprecated */ #define G_FILE_GAME_MAT (1 << 12) /* deprecated */ /* #define G_FILE_DISPLAY_LISTS (1 << 13) */ /* deprecated */ @@ -161,11 +165,19 @@ enum { #define G_FILE_GLSL_NO_NODES (1 << 20) /* deprecated */ #define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21) /* deprecated */ #define G_FILE_IGNORE_DEPRECATION_WARNINGS (1 << 22) /* deprecated */ +#endif /* DNA_DEPRECATED_ALLOW */ + +/* On read, use #FileGlobal.filename instead of the real location on-disk, + * needed for recovering temp files so relative paths resolve */ #define G_FILE_RECOVER (1 << 23) +/* On write, remap relative file paths to the new file location. */ #define G_FILE_RELATIVE_REMAP (1 << 24) +/* On write, make backup `.blend1`, `.blend2` ... files, when the users preference is enabled */ #define G_FILE_HISTORY (1 << 25) -#define G_FILE_MESH_COMPAT (1 << 26) /* BMesh option to save as older mesh format */ -#define G_FILE_SAVE_COPY (1 << 27) /* restore paths after editing them */ +/* BMesh option to save as older mesh format */ +#define G_FILE_MESH_COMPAT (1 << 26) +/* On wrote, restore paths after editing them (G_FILE_RELATIVE_REMAP) */ +#define G_FILE_SAVE_COPY (1 << 27) #define G_FILE_FLAGS_RUNTIME (G_FILE_NO_UI | G_FILE_RELATIVE_REMAP | G_FILE_MESH_COMPAT | G_FILE_SAVE_COPY) |