diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_global.h')
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 950c3c20b9b..593b4afb85c 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -64,8 +64,8 @@ typedef struct Global { short afbreek, moving, file_loaded; char background; char factory_startup; - short winpos, displaymode; /* used to be in Render */ - short rendering; /* to indicate render is busy, prevent renderwindow events etc */ + short winpos, displaymode; /* used to be in Render */ + short rendering; /* to indicate render is busy, prevent renderwindow events etc */ short rt; int f; @@ -75,7 +75,7 @@ typedef struct Global { struct BME_Glob *editBMesh; /* Frank's variables */ - int save_over; + int save_over; /* Rob's variables (keep here for WM recode) */ int have_quicktime; @@ -96,12 +96,12 @@ typedef struct Global { /* **************** GLOBAL ********************* */ /* G.f */ -#define G_RENDER_OGL (1 << 0) -#define G_SWAP_EXCHANGE (1 << 1) +#define G_RENDER_OGL (1 << 0) +#define G_SWAP_EXCHANGE (1 << 1) /* also uses G_FILE_AUTOPLAY */ /* #define G_RENDER_SHADOW (1 << 3) */ /* temp flag, removed */ -#define G_BACKBUFSEL (1 << 4) -#define G_PICKSEL (1 << 5) +#define G_BACKBUFSEL (1 << 4) +#define G_PICKSEL (1 << 5) /* #define G_FACESELECT (1 << 8) use (mesh->editflag & ME_EDIT_PAINT_MASK) */ @@ -109,7 +109,7 @@ typedef struct Global { #define G_SCRIPT_OVERRIDE_PREF (1 << 14) /* when this flag is set ignore the userprefs */ /* #define G_NOFROZEN (1 << 17) also removed */ -/* #define G_GREASEPENCIL (1 << 17) also removed */ +/* #define G_GREASEPENCIL (1 << 17) also removed */ /* #define G_AUTOMATKEYS (1 << 30) also removed */ @@ -130,39 +130,39 @@ enum { #define G_AUTOPACK (1 << 0) #define G_FILE_COMPRESS (1 << 1) #define G_FILE_AUTOPLAY (1 << 2) -#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_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_PUBLISH (1 << 9) */ /* deprecated */ -#define G_FILE_NO_UI (1 << 10) +#define G_FILE_NO_UI (1 << 10) /* #define G_FILE_GAME_TO_IPO (1 << 11) */ /* deprecated */ -#define G_FILE_GAME_MAT (1 << 12) /* deprecated */ +#define G_FILE_GAME_MAT (1 << 12) /* deprecated */ /* #define G_FILE_DISPLAY_LISTS (1 << 13) */ /* deprecated */ -#define G_FILE_SHOW_PHYSICS (1 << 14) /* deprecated */ -#define G_FILE_GAME_MAT_GLSL (1 << 15) /* deprecated */ +#define G_FILE_SHOW_PHYSICS (1 << 14) /* deprecated */ +#define G_FILE_GAME_MAT_GLSL (1 << 15) /* deprecated */ /* #define G_FILE_GLSL_NO_LIGHTS (1 << 16) */ /* deprecated */ -#define G_FILE_GLSL_NO_SHADERS (1 << 17) /* deprecated */ -#define G_FILE_GLSL_NO_SHADOWS (1 << 18) /* deprecated */ -#define G_FILE_GLSL_NO_RAMPS (1 << 19) /* deprecated */ -#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 */ -#define G_FILE_RECOVER (1 << 23) -#define G_FILE_RELATIVE_REMAP (1 << 24) -#define G_FILE_HISTORY (1 << 25) -#define G_FILE_MESH_COMPAT (1 << 26) /* BMesh option to save as older mesh format */ +#define G_FILE_GLSL_NO_SHADERS (1 << 17) /* deprecated */ +#define G_FILE_GLSL_NO_SHADOWS (1 << 18) /* deprecated */ +#define G_FILE_GLSL_NO_RAMPS (1 << 19) /* deprecated */ +#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 */ +#define G_FILE_RECOVER (1 << 23) +#define G_FILE_RELATIVE_REMAP (1 << 24) +#define G_FILE_HISTORY (1 << 25) +#define G_FILE_MESH_COMPAT (1 << 26) /* BMesh option to save as older mesh format */ /* G.windowstate */ -#define G_WINDOWSTATE_USERDEF 0 -#define G_WINDOWSTATE_BORDER 1 -#define G_WINDOWSTATE_FULLSCREEN 2 +#define G_WINDOWSTATE_USERDEF 0 +#define G_WINDOWSTATE_BORDER 1 +#define G_WINDOWSTATE_FULLSCREEN 2 /* ENDIAN_ORDER: indicates what endianness the platform where the file was * written had. */ -#if !defined( __BIG_ENDIAN__ ) && !defined( __LITTLE_ENDIAN__ ) +#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) # error Either __BIG_ENDIAN__ or __LITTLE_ENDIAN__ must be defined. #endif @@ -171,8 +171,8 @@ enum { # error "Mingw requires GCC 4.6 minimum" #endif -#define L_ENDIAN 1 -#define B_ENDIAN 0 +#define L_ENDIAN 1 +#define B_ENDIAN 0 #ifdef __BIG_ENDIAN__ # define ENDIAN_ORDER B_ENDIAN @@ -181,10 +181,10 @@ enum { #endif /* G.moving, signals drawing in (3d) window to denote transform */ -#define G_TRANSFORM_OBJ 1 -#define G_TRANSFORM_EDIT 2 -#define G_TRANSFORM_MANIP 4 -#define G_TRANSFORM_PARTICLE 8 +#define G_TRANSFORM_OBJ 1 +#define G_TRANSFORM_EDIT 2 +#define G_TRANSFORM_MANIP 4 +#define G_TRANSFORM_PARTICLE 8 /* G.special1 */ |