Fix 1960543: "Straight Onto fails in a file". When an layer was composed 'straight...

[synfig.git] / synfig-core / trunk / src / synfig / layer_pastecanvas.cpp

diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
index 572aee2..e456a03 100644 (file)
--- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp
@@ -395,8 +395,10 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali
 
        if (!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin))
        {
-               // if there's no intersection between the context and our surface, and we're rendering 'onto', then we're done
-               if (Color::is_onto(blend_method)) return true;
+               // if there's no intersection between the context and our
+               // surface, and we're rendering 'onto', then we're done
+               if (Color::is_onto(blend_method) && !Color::is_straight(blend_method))
+                       return true;
 
                /* 'straight' is faster than 'composite' and has the same
                 * effect if the affected area of the lower layer is