projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Shortcut color blending in get_color() when blend method is 'straight' and amount...
[synfig.git]
/
synfig-core
/
tags
/
stable
/
src
/
synfig
/
layer_composite.h
diff --git
a/synfig-core/tags/stable/src/synfig/layer_composite.h
b/synfig-core/tags/stable/src/synfig/layer_composite.h
index
d7d47a1
..
cb9497d
100644
(file)
--- a/
synfig-core/tags/stable/src/synfig/layer_composite.h
+++ b/
synfig-core/tags/stable/src/synfig/layer_composite.h
@@
-6,6
+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, 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
@@
-42,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
{
@@
-59,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_; }