From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Wed, 23 Jan 2008 21:13:59 +0000 (+0000)
Subject: The optimization of skipping the rendering of the layer's context only works for... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=4418e68821c7c860fb25a914aa103d800513ea7d;p=synfig.git

The optimization of skipping the rendering of the layer's context only works for straight rendering with amount=1, not for 'straight onto', and 'alpha brighten'.


git-svn-id: http://svn.voria.com/code@1442 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/synfig/context.cpp b/synfig-core/trunk/src/synfig/context.cpp
index d16c06b..144eba7 100644
--- a/synfig-core/trunk/src/synfig/context.cpp
+++ b/synfig-core/trunk/src/synfig/context.cpp
@@ -215,7 +215,7 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde
 		// is 1.0, and the layer doesn't depend on its context, then
 		// we don't want to render the context
 		if (composite &&
-			Color::is_straight(composite->get_blend_method()) &&
+			composite->get_blend_method() == Color::BLEND_STRAIGHT &&
 			composite->get_amount() == 1.0f &&
 			!composite->reads_context())
 		{
@@ -272,7 +272,7 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde
 
 			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);
 		}