X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=2002bd987910a7d28893ba32b1efd15db0671e39;hb=cb222b6df855da4196a331c5b9859750c4321fa0;hp=5f125fd11c64a0ed44e90321568364a948b30994;hpb=7e27b311e33beda1746eb63e0945633f262427f6;p=r2c2.git

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 5f125fd..2002bd9 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -95,8 +95,6 @@ Designer::Designer(int argc, char **argv):
 	}
 
 	// Setup OpenGL
-	GL::enable(GL_CULL_FACE);
-
 	pipeline = new GL::Pipeline(window.get_width(), window.get_height(), false);
 	pipeline->set_camera(&camera);
 	pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0);
@@ -164,6 +162,8 @@ Designer::Designer(int argc, char **argv):
 
 Designer::~Designer()
 {
+	for(vector<Toolbar *>::iterator i=toolbars.begin(); i!=toolbars.end(); ++i)
+		delete *i;
 	delete overlay;
 	delete pipeline;
 	delete base_object;
@@ -538,7 +538,6 @@ void Designer::render()
 	else
 	{
 		pipeline->render_all();
-		GL::enable(GL_CULL_FACE);
 		{
 			GL::Bind bind_blend(GL::Blend::alpha());
 			overlay->render(0);
@@ -555,11 +554,11 @@ void Designer::render()
 	GL::matrix_mode(GL::MODELVIEW);
 	GL::load_identity();
 
-	GL::disable(GL::DEPTH_TEST);
-
 	GL::Bind bind_blend(GL::Blend::alpha());
 	root.render();
+	// XXX Should fix GLtk so these would not be needed
 	GL::Texture::unbind();
+	glColor3f(1.0, 1.0, 1.0);
 }
 
 void Designer::track_added(Track &trk)