Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-07-13 23:42:08 +0400
committerTon Roosendaal <ton@blender.org>2005-07-13 23:42:08 +0400
commit75ae1ae5ef0d3bb37cd3a5c70699955cb207dcde (patch)
treedddd08d35bafcd07be90d330dbd72859e9b3df45 /source/blender/blenkernel/BKE_global.h
parent64af8d0ced696fd1ab3dbb452e1dda2a43843f6f (diff)
Armature "XRay mode" now draws nicely with solid too. For it to work, I
had to add a new feature to the 3d window, to collect "after draw" objects, which get drawn as last, after a clear of the zbuffer. Same method can be used for nice OpenGL transparent draw, the system is ready for it, do that later. The huge commit is caused by cleaning up globals from struct Global. Many variables were unused or just not needed anymore. Did that to move the ugly G.zbuf to where it belongs, in the View3D space struct. :)
Diffstat (limited to 'source/blender/blenkernel/BKE_global.h')
-rw-r--r--source/blender/blenkernel/BKE_global.h26
1 files changed, 7 insertions, 19 deletions
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 211280fae71..f7160eb1a13 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -91,15 +91,15 @@ typedef struct Global {
short totobj, totlamp, totobjsel, totcurve, totmesh, totbone, totbonesel;
int totvert, totedge, totface, totvertsel, totedgesel, totfacesel;
- short machine, afbreek, moving, colact, zbuf;
- short qual, background, imagewin, animspeed;
+ short afbreek, moving;
+ short qual, background;
short winpos, displaymode; /* used to be in Render */
/**
* The current version of Blender.
*/
short version;
- short simulf, fields, order, rt;
+ short simulf, order, rt;
int f;
/* Editmode lists */
@@ -108,9 +108,7 @@ typedef struct Global {
float textcurs[4][2];
/* Frank's variables */
- int renderd;
- int real_sfra, real_efra;
- int save_over;
+ int save_over;
/* Reevan's __NLA variables */
struct Object *obpose; /* Current posable object */
@@ -130,22 +128,12 @@ typedef struct Global {
struct bSoundListener* listener;
/* Test thingy for Nzc */
- int magic; /* toggle use of experimental render pipe */
int compat; /* toggle compatibility mode for edge rendering */
int notonlysolid;/* T-> also edge-render transparent faces */
- int useRscale; /* bitflag for using colour scaling */
- int useGscale; /* bitflag for using colour scaling */
- int useBscale; /* bitflag for using colour scaling */
- float cscale[4]; /* sliders for colour scaling */
- int Rhisto; /* flags for making histograms */
- int Ghisto;
- int Bhisto;
-
- /* special versions */
- short special1, special2;
-
+
+ /* confusing... G.f and G.flags */
int flags;
-
+
} Global;
/* **************** GLOBAL ********************* */