From: dooglus Date: Sat, 20 Sep 2008 10:47:57 +0000 (+0000) Subject: Fix 2119764 "eyedropper doesn't work with straight blends" for circles. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e74e7f97c7fe9ec10b0004a49a0222110539a4e5;p=synfig.git Fix 2119764 "eyedropper doesn't work with straight blends" for circles. git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2061 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp index 8df1e78..c9b1292 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp @@ -344,7 +344,7 @@ Circle::get_color(Context context, const Point &point)const return Color::blend(color,context.get_color(point),get_amount(),get_blend_method()); } else - return context.get_color(point); + return Color::blend(Color::alpha(),context.get_color(point),get_amount(),get_blend_method()); } //inside the circle's solid area (with feathering) @@ -357,7 +357,7 @@ Circle::get_color(Context context, const Point &point)const else return Color::blend(color,context.get_color(point),get_amount(),get_blend_method()); else - return context.get_color(point); + return Color::blend(Color::alpha(),context.get_color(point),get_amount(),get_blend_method()); } //If we get here, the pixel is within the feathering area, and is thus subject to falloff @@ -401,10 +401,7 @@ Circle::get_color(Context context, const Point &point)const alpha = falloff_func(cache,mag_squared); - //Compose falloff value with amount from the composite layer, and that is the blend value - alpha *= get_amount(); - - return Color::blend(color,context.get_color(point),alpha,get_blend_method()); + return Color::blend(color*alpha,context.get_color(point),get_amount(),get_blend_method()); } }