From: dooglus Date: Tue, 18 Nov 2008 12:07:17 +0000 (+0000) Subject: Fix 1993098: "Composited Inline canvases fails if background is transp.". This was... X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=85167b7ad1cd8cf1699fb03bffb4e6e2f058d53d;hp=48772bcdd008e35d1c1ca413646f4595a4065f3c;p=synfig.git Fix 1993098: "Composited Inline canvases fails if background is transp.". This was the same as bug 1671884, but failing to take account of a pastecanvas' zoom rather than its offset. dooglus.rincevent.net/synfig/pastecanvas-zoom-bug.sifz is a simple example that didn't render correctly before this fix. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2207 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index 2423392..bcf954f 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -411,7 +411,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali if (blend_method==Color::BLEND_COMPOSITE) blend_using_straight = true; } - if (!etl::intersect(context.get_full_bounding_rect(),full_bounding_rect+origin)) + if (!etl::intersect(context.get_full_bounding_rect(),(full_bounding_rect*exp(zoom))+origin)) { // if there's no intersection between the context and our // surface, and we're rendering 'onto', then we're done