projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change the order of the modules - magick++ is the last resort, other than the custom...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_composite.h
diff --git
a/synfig-core/trunk/src/synfig/layer_composite.h
b/synfig-core/trunk/src/synfig/layer_composite.h
index
fe47917
..
50aeeff
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_composite.h
+++ b/
synfig-core/trunk/src/synfig/layer_composite.h
@@
-43,7
+43,7
@@
class Layer_NoDeform {};
/*! \class Layer_Composite
/*! \class Layer_Composite
-** \brief Base class for layers that put stuff ontop of lower layers
+** \brief Base class for layers that put stuff on
top of lower layers
*/
class Layer_Composite : public Layer
{
*/
class Layer_Composite : public Layer
{
@@
-60,9
+60,14
@@
protected:
Color::BlendMethod blend_method=Color::BLEND_COMPOSITE
):
amount_ (amount),
Color::BlendMethod blend_method=Color::BLEND_COMPOSITE
):
amount_ (amount),
- blend_method_ (blend_method)
+ blend_method_ (blend_method),
+ converted_blend_ (false),
+ transparent_color_ (false)
{ }
{ }
+ bool converted_blend_;
+ bool transparent_color_;
+
public:
float get_amount()const { return amount_; }
public:
float get_amount()const { return amount_; }