X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=0546a4e847829f33844cf6236db2047816ba0b2f;hb=f33a98b1a044c8ac7b12778cbca6c4a124875e4a;hp=d7e175de7185fe39fcf890c2c8eeb89c8986346a;hpb=6cfe786e84d9d9474c7bd5a78d1b5c92e3868e4e;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index d7e175de..0546a4e8 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -147,9 +147,7 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 		setup_frame();
 
 	const Framebuffer *out_fbo = Framebuffer::current();
-	/* Binding the current object is a no-op, but this will restore the original
-	FBO in case an exception is thrown. */
-	Bind restore_fbo(out_fbo, true);
+	// XXX Make sure the correct FBO is restored if an exception is thrown
 
 	if(target[0])
 	{
@@ -169,6 +167,8 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 				renderer.render(*j->renderable, i->get_tag());
 	}
 
+	renderer.escape();
+
 	if(target[0])
 	{
 		if(samples)