if(layer_bounds.area() <= 0.0000000000001 || !(layer_bounds && bbox))
{
if (composite &&
- composite->get_blend_method() == Color::BLEND_STRAIGHT &&
+ Color::is_straight(composite->get_blend_method()) &&
composite->get_amount() != 0.0f)
{
straight_and_empty = true;
continue;
}
- // If this layer has Straight as the blend method and amount is 1.0
- // then we don't want to render the context
- if (composite && composite->get_blend_method() == Color::BLEND_STRAIGHT &&
- composite->get_amount() == 1.0f)
+ // If this layer has Straight as the blend method and amount
+ // is 1.0, and the layer doesn't depend on its context, then
+ // we don't want to render the context
+ if (composite &&
+ composite->get_blend_method() == Color::BLEND_STRAIGHT &&
+ composite->get_amount() == 1.0f &&
+ !composite->reads_context())
{
Layer::Handle layer = *context;
while (!context->empty()) context++; // skip the context
// using the appropriate 'amount'
if (straight_and_empty)
{
- if (ret = Context((context+1)).accelerated_render(surface,quality,renddesc,cb))
+ if ((ret = Context((context+1)).accelerated_render(surface,quality,renddesc,cb)))
{
Surface clearsurface;
clearsurface.set_wh(renddesc.get_w(),renddesc.get_h());
Surface::alpha_pen apen(surface->begin());
apen.set_alpha(composite->get_amount());
- apen.set_blend_method(Color::BLEND_STRAIGHT);
+ apen.set_blend_method(composite->get_blend_method());
clearsurface.blit_to(apen);
}
Context context(*this);
while(!(context)->empty())
{
- // If this layer is active, then go
- // ahead and break out of the loop
- if((*context)->active() && !(*context)->dirty_time_.is_equal(time))
+ // If this layer is active, and
+ // it either isn't already set to the given time or
+ // it's a time loop layer,
+ // then break out of the loop and set its time
+ if((*context)->active() &&
+ (!(*context)->dirty_time_.is_equal(time) ||
+ (*context)->get_name() == "timeloop"))
break;
// Otherwise, we want to keep searching