From f4ed8dcedceaba2eca469b4d4ab8bc216116ad98 Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 19 Sep 2008 16:13:02 +0000 Subject: [PATCH] Fix 1960543: "Straight Onto fails in a file". When an layer was composed 'straight onto' a context with which its bounding box had no overlap, the context was being displayed as if the 'straight onto' layer wasn't there. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2060 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/layer_pastecanvas.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index 572aee2..e456a03 100644 --- 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 -- 2.7.4