projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add optional debugging for calls to ValueNode_*::operator(). export SYNFIG_DEBUG_VAL...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_shape.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer_shape.cpp
b/synfig-core/trunk/src/synfig/layer_shape.cpp
index
8c4a818
..
2116d2f
100644
(file)
--- 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)
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)
//Ok, we're inside... bummmm ba bum buM...
if(get_blend_method() == Color::BLEND_STRAIGHT && get_amount() == 1)