X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_geometry%2Frectangle.cpp;h=374af9c1a7a98c2d1a90067fd35a197bf0a27f6c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=21fa4d2e07efde4513c5aee74de3ce3be20c4983;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp index 21fa4d2..374af9c 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp @@ -274,27 +274,26 @@ Rectangle::get_color(Context context, const Point &pos)const if( pos[0]min[0] && 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