projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'zelgadis_master' into genete_master
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_geometry
/
checkerboard.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
index
29f52e3
..
30bbf8e
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
+++ b/
synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp
@@
-160,7
+160,7
@@
CheckerBoard::get_color(Context context, const Point &getpos)const
return Color::blend(color,context.get_color(getpos),get_amount(),get_blend_method());
}
else
return Color::blend(color,context.get_color(getpos),get_amount(),get_blend_method());
}
else
- return
context.get_color(getpos
);
+ return
Color::blend(Color::alpha(),context.get_color(getpos),get_amount(),get_blend_method()
);
}
bool
}
bool