Revision: 2061
http://synfig.svn.sourceforge.net/synfig/?rev=2061&view=rev
Author: dooglus
Date: 2008-09-20 10:47:57 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Fix 2119764 "eyedropper doesn't work with straight blends" for circles.
Modified Paths:
--------------
synfig-core/trunk/src/modules/mod_geometry/circle.cpp
Modified: synfig-core/trunk/src/modules/mod_geometry/circle.cpp
===================================================================
--- synfig-core/trunk/src/modules/mod_geometry/circle.cpp 2008-09-19
16:13:02 UTC (rev 2060)
+++ synfig-core/trunk/src/modules/mod_geometry/circle.cpp 2008-09-20
10:47:57 UTC (rev 2061)
@@ -344,7 +344,7 @@
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 @@
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 @@
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());
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
