if(s==samples)
return;
+ unsigned old_samples = samples;
samples = s;
- create_targets(1);
+ try
+ {
+ create_targets(1);
+ }
+ catch(...)
+ {
+ samples = old_samples;
+ throw;
+ }
}
void Pipeline::set_camera(const Camera *c)
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])
{
{
Bind bind_depth_test(i->get_depth_test());
Bind bind_blend(i->get_blend());
- Bind bind_lighting(i->get_lighting());
+ renderer.set_lighting(i->get_lighting());
for(vector<Slot>::const_iterator j=renderables.begin(); j!=renderables.end(); ++j)
if(j->passes.empty() || j->passes.count(i->get_tag()))
renderer.render(*j->renderable, i->get_tag());
}
+ renderer.escape();
+
if(target[0])
{
if(samples)