diff options
Diffstat (limited to 'source/blender/blenkernel/BKE_global.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_global.h | 109 |
1 files changed, 13 insertions, 96 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index e8918bcdce6..4b7ddf43647 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -42,46 +42,16 @@ extern "C" { #endif /* forwards */ -struct View3D; -struct View2D; -struct SpaceIpo; -struct SpaceButs; -struct SpaceImage; -struct SpaceOops; -struct SpaceText; -struct SpaceSound; -struct SpaceAction; -struct SpaceNla; struct Main; -struct Scene; -struct bScreen; struct Object; struct bSoundListener; -struct BMF_Font; -struct EditMesh; struct BME_Glob; typedef struct Global { /* active pointers */ - struct View3D *vd; - struct View2D *v2d; - struct SpaceIpo *sipo; - struct SpaceButs *buts; - struct SpaceImage *sima; - struct SpaceOops *soops; - struct SpaceSound *ssound; - struct SpaceAction *saction; /* __NLA */ - struct SpaceNla *snla; struct Main *main; - struct Scene *scene; /* denk aan file.c */ - struct bScreen *curscreen; - struct Object *obedit; - char editModeTitleExtra[64]; - /* fonts, allocated global data */ - struct BMF_Font *font, *fonts, *fontss; - /* strings: lastsaved */ char ima[256], sce[256], lib[256]; @@ -90,38 +60,22 @@ typedef struct Global { /* strings of recent opend files */ struct ListBase recent_files; - - /* totals */ - int totobj, totlamp, totobjsel, totcurve, totmesh; - int totbone, totbonesel; - int totvert, totedge, totface, totvertsel, totedgesel, totfacesel; - + short afbreek, moving; - short qual, background; + short background; short winpos, displaymode; /* used to be in Render */ short rendering; /* to indicate render is busy, prevent renderwindow events etc */ - /** - * The current version of Blender. - */ - short version; - short simulf, order, rt; + + short rt; int f; - /* Editmode lists */ - struct EditMesh *editMesh; - /* Used for BMesh transformations */ struct BME_Glob *editBMesh; - float textcurs[4][2]; - /* Frank's variables */ int save_over; - /* Reevan's __NLA variables */ - struct ListBase edbo; /* Armature Editmode bones */ - - /* Rob's variables */ + /* Rob's variables (keep here for WM recode) */ int have_quicktime; int ui_international; int charstart; @@ -142,10 +96,6 @@ typedef struct Global { /* Janco's playing ground */ struct bSoundListener* listener; - /* Test thingy for Nzc */ - int compat; /* toggle compatibility mode for edge rendering */ - int notonlysolid;/* T-> also edge-render transparent faces */ - /* ndof device found ? */ int ndofdevice; @@ -158,45 +108,29 @@ typedef struct Global { /* G.f */ #define G_RENDER_OGL (1 << 0) -#define G_PLAYANIM (1 << 1) +#define G_SWAP_EXCHANGE (1 << 1) /* also uses G_FILE_AUTOPLAY */ #define G_RENDER_SHADOW (1 << 3) #define G_BACKBUFSEL (1 << 4) #define G_PICKSEL (1 << 5) -#define G_DRAWNORMALS (1 << 6) -#define G_DRAWFACES (1 << 7) + #define G_FACESELECT (1 << 8) -#define G_DRAW_EXT (1 << 9) + #define G_VERTEXPAINT (1 << 10) -#define G_ALLEDGES (1 << 11) + #define G_DEBUG (1 << 12) #define G_DOSCRIPTLINKS (1 << 13) -#define G_DRAW_VNORMALS (1 << 14) + #define G_WEIGHTPAINT (1 << 15) #define G_TEXTUREPAINT (1 << 16) /* #define G_NOFROZEN (1 << 17) also removed */ #define G_GREASEPENCIL (1 << 17) -#define G_DRAWEDGES (1 << 18) -#define G_DRAWCREASES (1 << 19) -#define G_DRAWSEAMS (1 << 20) -#define G_HIDDENEDGES (1 << 21) -/* Measurement info Drawing */ -#define G_DRAW_EDGELEN (1 << 22) -#define G_DRAW_FACEAREA (1 << 23) -#define G_DRAW_EDGEANG (1 << 24) - -/* #define G_RECORDKEYS (1 << 25) also removed */ -/*#ifdef WITH_VERSE*/ -#define G_VERSE_CONNECTED (1 << 26) -#define G_DRAW_VERSE_DEBUG (1 << 27) -/*#endif*/ -#define G_DRAWSHARP (1 << 28) /* draw edges with the sharp flag */ + #define G_SCULPTMODE (1 << 29) #define G_PARTICLEEDIT (1 << 30) /* #define G_AUTOMATKEYS (1 << 30) also removed */ #define G_HIDDENHANDLES (1 << 31) /* used for curves only */ -#define G_DRAWBWEIGHTS (1 << 31) /* macro for testing face select mode * Texture paint could be removed since selected faces are not used @@ -234,28 +168,11 @@ typedef struct Global { #define G_WINDOWSTATE_BORDER 1 #define G_WINDOWSTATE_FULLSCREEN 2 -/* G.simulf */ -#define G_LOADFILE 2 -#define G_RESTART 4 -#define G_QUIT 8 -#define G_SETSCENE 16 - -/* G.qual */ -#define R_SHIFTKEY 1 -#define L_SHIFTKEY 2 -#define LR_SHIFTKEY 3 -#define R_ALTKEY 4 -#define L_ALTKEY 8 -#define LR_ALTKEY 12 -#define R_CTRLKEY 16 -#define L_CTRLKEY 32 -#define LR_CTRLKEY 48 -#define LR_COMMANDKEY 64 - -/* G.order: indicates what endianness the platform where the file was +/* ENDIAN_ORDER: indicates what endianness the platform where the file was * written had. */ #define L_ENDIAN 1 #define B_ENDIAN 0 +extern short ENDIAN_ORDER; /* G.moving, signals drawing in (3d) window to denote transform */ #define G_TRANSFORM_OBJ 1 |