X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=62e5ced05aa90c254ba4149546091295615f541a;hb=22f0f95981f17524587f5f2c5e3e91005240ddb7;hp=302d943727a2812e66bd6b85f748f398117bd4d9;hpb=a1c39449fccf03ec08787bf51d62bf3b4cb60f69;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 302d9437..62e5ced0 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -5,7 +5,6 @@
 #include "error.h"
 #include "lighting.h"
 #include "material.h"
-#include "mesh.h"
 #include "program.h"
 #include "programdata.h"
 #include "renderable.h"
@@ -144,11 +143,6 @@ void Renderer::flush_shader_data()
 		shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
 }
 
-void Renderer::set_mesh(const Mesh *m)
-{
-	state->mesh = m;
-}
-
 void Renderer::set_vertex_setup(const VertexSetup *vs)
 {
 	state->vertex_setup = vs;
@@ -235,7 +229,6 @@ void Renderer::end()
 	shdata_stack.clear();
 	excluded.clear();
 
-	Mesh::unbind();
 	Texturing::unbind();
 	Texture::unbind_from(0);
 	Clipping::unbind();
@@ -336,17 +329,10 @@ void Renderer::apply_state()
 	else
 		Program::unbind();
 
-	if(state->mesh)
-		state->mesh->bind();
+	if(state->vertex_setup)
+		state->vertex_setup->bind();
 	else
-	{
-		Mesh::unbind();
-
-		if(state->vertex_setup)
-			state->vertex_setup->bind();
-		else
-			VertexSetup::unbind();
-	}
+		VertexSetup::unbind();
 
 	if(state->winding_test)
 	{
@@ -370,7 +356,6 @@ Renderer::State::State():
 	clipping(0),
 	shprog(0),
 	shdata_count(0),
-	mesh(0),
 	vertex_setup(0),
 	winding_test(0),
 	reverse_winding(false),