From: dooglus Date: Sat, 20 Sep 2008 16:48:35 +0000 (+0000) Subject: Fix 2119764 "eyedropper doesn't work with straight blends" for all layer_shape layers... X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=36233194ac57de8209c0849950cf03d66ec09c99;p=synfig.git Fix 2119764 "eyedropper doesn't work with straight blends" for all layer_shape layers (region, outline, etc). git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2064 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index 8c4a818..2116d2f 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -1285,7 +1285,7 @@ Layer_Shape::get_color(Context context, const Point &p)const bool intersect = ((!!intercepts) ^ invert); if(!intersect) - return context.get_color(pp); + return Color::blend(Color::alpha(),context.get_color(pp),get_amount(),get_blend_method()); //Ok, we're inside... bummmm ba bum buM... if(get_blend_method() == Color::BLEND_STRAIGHT && get_amount() == 1)