diff options
author | Ton Roosendaal <ton@blender.org> | 2005-07-13 23:42:08 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-07-13 23:42:08 +0400 |
commit | 75ae1ae5ef0d3bb37cd3a5c70699955cb207dcde (patch) | |
tree | dddd08d35bafcd07be90d330dbd72859e9b3df45 /source/blender/src/transform_manipulator.c | |
parent | 64af8d0ced696fd1ab3dbb452e1dda2a43843f6f (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/src/transform_manipulator.c')
-rw-r--r-- | source/blender/src/transform_manipulator.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c index ecabe7e4add..c6f68ac331c 100644 --- a/source/blender/src/transform_manipulator.c +++ b/source/blender/src/transform_manipulator.c @@ -955,7 +955,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i /* restore */ myloadmatrix(G.vd->viewmat); gluDeleteQuadric(qobj); - if(G.zbuf) glEnable(GL_DEPTH_TEST); // shouldn't be global, tsk! + if(G.vd->zbuf) glEnable(GL_DEPTH_TEST); } @@ -1041,7 +1041,7 @@ static void draw_manipulator_scale(float mat[][4], int moving, int drawflags, in /* restore */ myloadmatrix(G.vd->viewmat); - if(G.zbuf) glEnable(GL_DEPTH_TEST); // shouldn't be global, tsk! + if(G.vd->zbuf) glEnable(GL_DEPTH_TEST); glFrontFace(GL_CCW); } @@ -1140,7 +1140,7 @@ static void draw_manipulator_translate(float mat[][4], int moving, int drawflags gluDeleteQuadric(qobj); myloadmatrix(G.vd->viewmat); - if(G.zbuf) glEnable(GL_DEPTH_TEST); // shouldn't be global, tsk! + if(G.vd->zbuf) glEnable(GL_DEPTH_TEST); } @@ -1240,7 +1240,7 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag gluDeleteQuadric(qobj); myloadmatrix(G.vd->viewmat); - if(G.zbuf) glEnable(GL_DEPTH_TEST); // shouldn't be global, tsk! + if(G.vd->zbuf) glEnable(GL_DEPTH_TEST); } |