X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=fd638fb6ebbbbdd0a95a78caa57586d67b7660bf;hb=6db6b7e49848e6bbc14f3ec8113ee5a941e4af07;hp=8229515f96d6830846f0505590d811329715c946;hpb=99db57eae00ab3c0611ae74fcf6d15de410611ef;p=libs%2Fgl.git diff --git a/source/pipeline.cpp b/source/pipeline.cpp index 8229515f..fd638fb6 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,7 +167,7 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const renderer.render(*j->renderable, i->get_tag()); } - renderer.escape(); + renderer.end(); if(target[0]) {