--- cvsroot/libgender/material.C	2004/10/29 23:19:08	1.19
+++ cvsroot/libgender/material.C	2004/10/30 00:17:28	1.20
@@ -86,17 +86,17 @@
 test_material::test_material ()
 : tex ("textures/osama.jpg"), texvar (tex.name)
 {
-  using namespace shader;
+  using namespace shader::compile;
 
   p.vsh->start ();
 
   temp_4f wpos;
   
-  wpos = shader::gl.model_view_projection_matrix * vin.vertex;
+  wpos = model_view_projection_matrix * vin.vertex;
 
   vout.position = wpos;
   vout.tex_coord[0] = vin.tex_coord[0];
-  vout.tex_coord[1] = shader::gl.model_view_matrix * shader::vec4 (x (vin.normal), y(vin.normal), z(vin.normal), 0);
+  vout.tex_coord[1] = model_view_matrix * shader::compile::vec4 (x(vin.normal), y(vin.normal), z(vin.normal), 0);
 
   p.vsh->end ();
   p.vsh->compile ();