projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add matrix.h. Matrix implementation for bones.
[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
1db98e2
..
cb9497d
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_composite.h
+++ b/
synfig-core/trunk/src/synfig/layer_composite.h
@@
-6,7
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** Copyright (c) 2007
, 2008
Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-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_; }