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. :)

1 files changed, 20 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 28a30235038..da132a65e52 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -38,6 +38,7 @@ struct Object;
 struct Image;
 struct Tex;
 struct SpaceLink;
+struct Base;
 
 /* This is needed to not let VC choke on near and far... old
  * proprietary MS extensions... */
@@ -48,6 +49,8 @@ struct SpaceLink;
 #define far clipend
 #endif
 
+#include "DNA_listBase.h"
+
 /* The near/far thing is a Win EXCEPTION. Thus, leave near/far in the
  * code, and patch for windows. */
 
@@ -59,6 +62,18 @@ typedef struct BGpic {
 	unsigned int *rect;
 } BGpic;
 
+#
+#
+typedef struct View3DAfter {
+	struct View3DAfter *next, *prev;
+	struct Base *base;
+	int type;
+} View3DAfter;
+
+/* View3DAfter->type */
+#define V3D_XRAY	1
+#define V3D_TRANSP	2
+
 typedef struct View3D {
 	struct SpaceLink *next, *prev;
 	int spacetype;
@@ -111,6 +126,11 @@ typedef struct View3D {
 	short twtype, twmode, twflag, twpad;
 	float twmat[4][4];
 	
+	/* afterdraw, for xray & transparent */
+	struct ListBase afterdraw;
+	/* drawflags, denoting state */
+	short zbuf, transp, xray, pad2;
+	
 } View3D;
 
 /* View3D->flag */