diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:39:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:49:13 +0300 |
| commit | afcbf7cf1357723f59eca8e118a0ca9ef6cf6555 (patch) | |
| tree | 95c520cd1e556f3cf1fa0a799bc23efe649cf22c /source/blender/blenkernel/BKE_global.h | |
| parent | a53011d52012067ad1334d654a68c97327005626 (diff) | |
Cleanup: use G_FLAG_*/G_FILE_* for G.f/fileflags
Was confusing eg: G_AUTOPACK belonged to G.fileflags, G_PICKSEL to G.f.
Diffstat (limited to 'source/blender/blenkernel/BKE_global.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 0724a82c8d7..75eb5a327de 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -106,24 +106,14 @@ typedef struct Global { /** #Global.f */ enum { - G_RENDER_OGL = (1 << 0), - G_SWAP_EXCHANGE = (1 << 1), -/* #define G_RENDER_SHADOW (1 << 3) */ /* temp flag, removed */ - G_BACKBUFSEL = (1 << 4), - G_PICKSEL = (1 << 5), - -/* #define G_FACESELECT (1 << 8) use (mesh->editflag & ME_EDIT_PAINT_FACE_SEL) */ - - G_SCRIPT_AUTOEXEC = (1 << 13), - /** When this flag is set ignore the userprefs. */ - G_SCRIPT_OVERRIDE_PREF = (1 << 14), - G_SCRIPT_AUTOEXEC_FAIL = (1 << 15), - G_SCRIPT_AUTOEXEC_FAIL_QUIET = (1 << 16), - -/* #define G_NOFROZEN (1 << 17) also removed */ -/* #define G_GREASEPENCIL (1 << 17) also removed */ - -/* #define G_AUTOMATKEYS (1 << 30) also removed */ + G_FLAG_RENDER_VIEWPORT = (1 << 0), + G_FLAG_BACKBUFSEL = (1 << 4), + G_FLAG_PICKSEL = (1 << 5), + G_FLAG_SCRIPT_AUTOEXEC = (1 << 13), + /** When this flag is set ignore the prefs #USER_SCRIPT_AUTOEXEC_DISABLE. */ + G_FLAG_SCRIPT_OVERRIDE_PREF = (1 << 14), + G_FLAG_SCRIPT_AUTOEXEC_FAIL = (1 << 15), + G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET = (1 << 16), }; /** #Global.debug */ @@ -161,7 +151,7 @@ enum { /** #Global.fileflags */ enum { - G_AUTOPACK = (1 << 0), + G_FILE_AUTOPACK = (1 << 0), G_FILE_COMPRESS = (1 << 1), G_FILE_USERPREFS = (1 << 9), |