Revision: 2063
http://synfig.svn.sourceforge.net/synfig/?rev=2063&view=rev
Author: dooglus
Date: 2008-09-20 15:46:33 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Fix 2119764 "eyedropper doesn't work with straight blends" for rectangles.
Modified Paths:
--------------
synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
Modified: synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp
===================================================================
--- synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp 2008-09-20
15:02:11 UTC (rev 2062)
+++ synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp 2008-09-20
15:46:33 UTC (rev 2063)
@@ -274,27 +274,26 @@
if( pos[0]<max[0] && pos[0]>min[0] &&
pos[1]<max[1] && pos[1]>min[1] )
{
+ // inside the expanded rectangle
if(invert)
- return context.get_color(pos);
- else
- {
- if(is_solid_color())
- return color;
- else
- return
Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
+ return
Color::blend(Color::alpha(),context.get_color(pos),get_amount(),get_blend_method());
- }
- }
+ if(is_solid_color())
+ return color;
- if(invert)
+ return
Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
+ }
+ else
{
+ // outside the expanded rectangle
+ if(!invert)
+ return
Color::blend(Color::alpha(),context.get_color(pos),get_amount(),get_blend_method());
+
if(is_solid_color())
return color;
- else
- return
Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
- }
- return context.get_color(pos);
+ return
Color::blend(color,context.get_color(pos),get_amount(),get_blend_method());
+ }
}
bool
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
